Convert qtlocation to the new configure system

And clean up the code detecting gypsy and the WinRT
positioning API.

Change-Id: Ic561d565d6fc733703ef6c0dc164e737e0b3d4fd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

5 files changed, 59 insertions, 9 deletions

diff --git a/config.tests/gypsy/gypsy.pro b/config.tests/gypsy/gypsy.pro
index f9dcffa9..93d56eb1 100644
--- a/config.tests/gypsy/gypsy.pro
+++ b/config.tests/gypsy/gypsy.pro
@@ -1,6 +1,2 @@
 TEMPLATE = app
-unix {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += gypsy gconf-2.0
-}
 SOURCES += main.cpp
diff --git a/configure.json b/configure.json
new file mode 100644
index 00000000..d54624af
--- /dev/null
+++ b/configure.json
@@ -0,0 +1,5 @@
+{
+    "subconfigs": [
+        "src/positioning"
+    ]
+}
diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro
index be65f183..c7b74325 100644
--- a/src/plugins/position/gypsy/gypsy.pro
+++ b/src/plugins/position/gypsy/gypsy.pro
@@ -1,6 +1,6 @@
 TARGET = qtposition_gypsy
 
-QT = core positioning
+QT = core positioning-private
 
 HEADERS += \
     qgeosatelliteinfosource_gypsy_p.h \
@@ -10,8 +10,7 @@ SOURCES += \
     qgeosatelliteinfosource_gypsy.cpp \
     qgeopositioninfosourcefactory_gypsy.cpp
 
-CONFIG += link_pkgconfig
-PKGCONFIG += gypsy gconf-2.0
+QMAKE_USE_PRIVATE += gypsy
 
 OTHER_FILES += \
     plugin.json
diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro
index 4df733b9..1687a9d2 100644
--- a/src/plugins/position/position.pro
+++ b/src/plugins/position/position.pro
@@ -1,8 +1,10 @@
 TEMPLATE = subdirs
 
+QT_FOR_CONFIG += positioning-private
+
 qtHaveModule(dbus):SUBDIRS += geoclue
-config_gypsy:SUBDIRS += gypsy
-config_winrt:SUBDIRS += winrt
+qtConfig(gypsy):SUBDIRS += gypsy
+qtConfig(winrt_geolocation):SUBDIRS += winrt
 qtHaveModule(simulator):SUBDIRS += simulator
 osx|ios|tvos:SUBDIRS += corelocation
 android:SUBDIRS += android
diff --git a/src/positioning/configure.json b/src/positioning/configure.json
new file mode 100644
index 00000000..22b77be6
--- /dev/null
+++ b/src/positioning/configure.json
@@ -0,0 +1,48 @@
+{
+    "module": "positioning",
+    "testDir": "../../config.tests",
+
+    "libraries": {
+        "gypsy": {
+            "label": "Gypsy",
+            "test": "gypsy",
+            "sources": [
+                { "type": "pkgConfig", "args": "gypsy gconf-2.0" }
+            ]
+        }
+    },
+
+    "tests": {
+        "winrt_geolocation": {
+            "label": "WinRT Geolocation API",
+            "type": "compile",
+            "test": "winrt"
+        }
+    },
+
+    "features": {
+        "gypsy": {
+            "label": "Gypsy GPS Daemon",
+            "condition": "libs.gypsy",
+            "output": [ "privateFeature" ]
+        },
+        "winrt_geolocation": {
+            "label": "WinRT Geolocation API",
+            "condition": "tests.winrt_geolocation",
+            "output": [ "privateFeature" ]
+        }
+    },
+
+    "report": [
+    ],
+
+    "summary": [
+        {
+            "section": "Qt Location",
+            "entries": [
+                "gypsy",
+                "winrt_geolocation"
+            ]
+        }
+    ]
+}