Update positioning sources to use new plugin style

Notably, also splits the default sources that were previously compiled
into the library, out into their own plugins. This follows a similar
pattern to the geoservices change.

We also drop the "plugin whitelisting" feature in favour of a simple
Priority value in the plugin JSON -- the whitelist provides no
additional security over this solution on any of our platforms.

Task-number: QTBUG-24331

Change-Id: I62a9c940157ad2e33a9a575fa09633b98656b276
Reviewed-by: Alex <alex.blasche@nokia.com>

1 files changed, 2 insertions, 67 deletions

diff --git a/src/location/location.pro b/src/location/location.pro
index a67962e8..77720df8 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -14,7 +14,8 @@ INCLUDEPATH += $$QT.location.private_includes/QtLocation
 
 load(qt_module_config)
 
-HEADERS += qtlocationversion.h
+HEADERS += qtlocationversion.h \
+    qgeopositioninfosource_p.h
 
 include(maps/maps.pri)
 include(places/places.pri)
@@ -47,60 +48,6 @@ PRIVATE_HEADERS += \
                     qgeoareamonitor_polling_p.h \
                     qgeocoordinate_p.h
 
-maemo6|meego {
-    CONFIG += qdbus link_pkgconfig
-    SOURCES += qgeopositioninfosource_maemo.cpp \
-                qgeosatelliteinfosource_maemo.cpp \
-                dbuscomm_maemo.cpp \
-                dbusserver_maemo.cpp
-    PRIVATE_HEADERS += qgeopositioninfosource_maemo_p.h \
-                qgeosatelliteinfosource_maemo_p.h \
-                dbuscomm_maemo_p.h \
-                dbusserver_maemo_p.h
-}
-
-
-meego {
-    contains (geoclue-master_enabled, yes) {
-        message("Building location with GeoClue master support.")
-        SOURCES += qgeopositioninfosource_geocluemaster.cpp
-        PRIVATE_HEADERS += qgeopositioninfosource_geocluemaster_p.h
-        DEFINES += GEOCLUE_MASTER_AVAILABLE=1
-        PKGCONFIG += geoclue
-        QMAKE_PKGCONFIG_REQUIRES += geoclue
-    } else {
-        message("Building location without GeoClue master support.")
-    }
-    contains (gypsy_enabled, yes) {
-        message("Building location with Gypsy support.")
-        SOURCES += qgeosatelliteinfosource_gypsy.cpp
-        PRIVATE_HEADERS += qgeosatelliteinfosource_gypsy_p.h
-        DEFINES += GYPSY_AVAILABLE=1
-        PKGCONFIG += gypsy
-        QMAKE_PKGCONFIG_REQUIRES += gypsy
-    } else {
-        message("Building location without Gypsy support.")
-    }
-    if (contains(gypsy_enabled, yes) || contains (geoclue-master_enabled, yes)) {
-        CONFIG += qdbus link_pkgconfig
-        PKGCONFIG += gconf-2.0 glib-2.0
-        QMAKE_PKGCONFIG_REQUIRES += glib-2.0 gconf-2.0
-    }
-}
-
-contains(config_test_locationd, yes):!simulator {
-    DEFINES += NPE_BACKEND
-    INCLUDEPATH += $$[QT_INSTALL_PREFIX]/include/mtlocationd
-#unix {
-#    CONFIG += link_pkgconfig
-#    PKGCONFIG += mtlocationd
-#}
-    LIBS += -lmtlocationd
-    SOURCES += qgeopositioninfosource_npe_backend.cpp\
-               qgeosatelliteinfosource_npe_backend.cpp
-    PRIVATE_HEADERS += qgeopositioninfosource_npe_backend_p.h\
-                       qgeosatelliteinfosource_npe_backend_p.h
-}
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 
@@ -122,15 +69,3 @@ SOURCES += \
             qgeopositioninfosourcefactory.cpp \
             qtlocation.cpp
 
-simulator {
-    QT += simulator
-    DEFINES += QT_SIMULATOR
-    SOURCES += qgeopositioninfosource_simulator.cpp \
-                qlocationdata_simulator.cpp \
-                qgeosatelliteinfosource_simulator.cpp \
-                qlocationconnection_simulator.cpp
-    HEADERS += qgeopositioninfosource_simulator_p.h \
-                qlocationdata_simulator_p.h \
-                qgeosatelliteinfosource_simulator_p.h \
-                qlocationconnection_simulator_p.h
-}