Merge branch 'jb51489' into 'mer-5.4'

Rebase patches on top of the 5.4.2 release. See merge request mer-core/qtlocation!18
sailfishos · Nov 18, 2020 · 44dffa7 · 44dffa7
2 parents f88c90a + d39dd47
commit 44dffa7
Show file tree

Hide file tree

Showing 238 changed files with 6,628 additions and 6,896 deletions.
diff --git a/config.tests/geoclue-satellite/geoclue-satellite.pro b/config.tests/geoclue-satellite/geoclue-satellite.pro
diff --git a/config.tests/geoclue-satellite/main.cpp b/config.tests/geoclue-satellite/main.cpp
diff --git a/config.tests/geoclue/geoclue.pro b/config.tests/geoclue/geoclue.pro
diff --git a/config.tests/geoclue/main.cpp b/config.tests/geoclue/main.cpp
diff --git a/examples/location/mapviewer/content/map/MapComponent.qml b/examples/location/mapviewer/content/map/MapComponent.qml
@@ -123,7 +123,7 @@ Map {
     }
 
     MapQuickItem {
-        id: poiNokia
+        id: poiBrisbaneOffice
         sourceItem: Rectangle { width: 14; height: 14; color: "#1c94fc"; border.width: 2; border.color: "#242424"; smooth: true; radius: 7 }
         coordinate {
            latitude: -27.5796
@@ -136,15 +136,15 @@ Map {
 
     MapQuickItem {
         sourceItem: Text{
-            text: "Nokia"
+            text: "Brisbane Office"
             color:"#242424"
             font.bold: true
             styleColor: "#ECECEC"
             style: Text.Outline
         }
-        coordinate: poiNokia.coordinate
-        anchorPoint.x: -poiNokia.sourceItem.width * 0.5
-        anchorPoint.y: poiNokia.sourceItem.height * 1.5
+        coordinate: poiBrisbaneOffice.coordinate
+        anchorPoint.x: -poiBrisbaneOffice.sourceItem.width * 0.5
+        anchorPoint.y: poiBrisbaneOffice.sourceItem.height * 1.5
     }
 
 

diff --git a/examples/location/mapviewer/mapviewer.qml b/examples/location/mapviewer/mapviewer.qml
@@ -488,7 +488,7 @@ Item {
 
     /*    GeocodeModel {
         id: geocodeModel
-        plugin : Plugin { name : "nokia"}
+        plugin : Plugin { name : "here"}
         onLocationsChanged: {
             if (geocodeModel.count > 0) {
                 console.log('setting the coordinate as locations changed in model.')

diff --git a/examples/location/places/places.qml b/examples/location/places/places.qml
@@ -96,8 +96,8 @@ Item {
             for (var i = 0; i<plugins.length; i++) {
                 addItem(plugins[i]);
 
-                // default to nokia plugin
-                if (plugins[i] === "nokia")
+                // default to HERE plugin
+                if (plugins[i] === "here")
                     exclusiveButton = plugins[i];
             }
 

diff --git a/examples/location/places_list/places_list.qml b/examples/location/places_list/places_list.qml
@@ -52,8 +52,8 @@ Rectangle {
     //! [Initialize Plugin]
     Plugin {
         id: myPlugin
-        name: "nokia"
-        //specify plugin parameters as necessary
+        name: "here"
+        //specify plugin parameters as necessary, e.g. app_id and app_code
         //PluginParameter {...}
         //PluginParameter {...}
         //...

diff --git a/examples/location/places_map/places_map.qml b/examples/location/places_map/places_map.qml
@@ -51,8 +51,8 @@ Rectangle {
     //! [Initialize Plugin]
     Plugin {
         id: myPlugin
-        name: "nokia"
-        //specify plugin parameters if necessary
+        name: "here"
+        //specify plugin parameters if necessary, e.g. app_id and app_code
         //PluginParameter {...}
         //PluginParameter {...}
         //...

diff --git a/qtlocation.pro b/qtlocation.pro
@@ -1,6 +1,4 @@
 load(configure)
-qtCompileTest(geoclue)
-qtCompileTest(geoclue-satellite)
 qtCompileTest(gypsy)
 
 load(qt_parts)
diff --git a/rpm/qtlocation-plugin-position-geoclue.spec b/rpm/qtlocation-plugin-position-geoclue.spec
@@ -0,0 +1,57 @@
+Name:       qt5-plugin-position-geoclue
+Summary:    Qt Positioning plugin for Geoclue
+Version:    5.4.2
+Release:    1%{?dist}
+Group:      Qt/Qt
+License:    LGPLv2.1 with exception or GPLv3
+URL:        http://qt-project.org/
+Source0:    %{name}-%{version}.tar.xz
+BuildRequires:  qt5-qtpositioning-devel
+BuildRequires:  qt5-qtdbus-devel
+BuildRequires:  qt5-qmake
+BuildRequires:  qt5-tools
+Requires:       geoclue
+Obsoletes:      qt5-qtlocation-plugin-position-geoclue <= 5.1.0+git7
+Provides:       qt5-qtlocation-plugin-position-geoclue > 5.1.0+git7
+
+%description
+This package contains the position plugin for Geoclue
+
+
+#### Build section
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+export QTDIR=/usr/share/qt5
+touch .git
+
+# Run qmake in project root to run config tests
+qmake -qt=5
+# Build only the Geoclue plugin
+cd src/plugins/position/geoclue
+qmake -qt=5
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+cd src/plugins/position/geoclue
+%qmake5_install
+
+# Remove the cmake file
+rm %{buildroot}/%{_libdir}/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake
+
+
+#### Pre/Post section
+
+
+#### File section
+
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/qt5/plugins/position/*geoclue*
+
+
+#### No changelog section, separate $pkg.changelog contains the history