From 5bf1bd00335d0c95c54de426a02da2a98257fedb Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Fri, 30 Sep 2016 18:33:12 -0700
Subject: Port qtsensors to the new configure framework

Don't invoke pkg-config at build time, automatically check
for sensorfw and compile the correct plugin if found.

Change-Id: I30dcd41cdebd7cf082cec66f3122c24fbab5c893
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
---
 configure.json                            |  5 +++++
 src/plugins/sensors/sensorfw/sensorfw.pro |  6 ++----
 src/plugins/sensors/sensors.pro           |  3 ++-
 src/sensors/configure.json                | 32 +++++++++++++++++++++++++++++++
 src/sensors/doc/src/sensorfwbackend.qdoc  |  4 ----
 5 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 configure.json
 create mode 100644 src/sensors/configure.json

diff --git a/configure.json b/configure.json
new file mode 100644
index 0000000..a08cf03
--- /dev/null
+++ b/configure.json
@@ -0,0 +1,5 @@
+{
+    "subconfigs": [
+        "src/sensors"
+    ]
+}
diff --git a/src/plugins/sensors/sensorfw/sensorfw.pro b/src/plugins/sensors/sensorfw/sensorfw.pro
index b30b362..63a6611 100644
--- a/src/plugins/sensors/sensorfw/sensorfw.pro
+++ b/src/plugins/sensors/sensorfw/sensorfw.pro
@@ -1,11 +1,9 @@
 TARGET = qtsensors_sensorfw
-QT = core sensors network dbus
+QT = core sensors-private network dbus
 
 include(sensorfw.pri)
 
-
-CONFIG += link_pkgconfig
-PKGCONFIG += sensord-qt5
+QMAKE_USE += sensorfw
 
 CONFIGFILES.files = Sensors.conf
 CONFIGFILES.path = /etc/xdg/QtProject/
diff --git a/src/plugins/sensors/sensors.pro b/src/plugins/sensors/sensors.pro
index af2fae1..7698933 100644
--- a/src/plugins/sensors/sensors.pro
+++ b/src/plugins/sensors/sensors.pro
@@ -1,10 +1,11 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += sensors-private
 
 android {
     isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = android generic
 }
 
-sensorfw {
+qtConfig(sensorfw) {
     isEmpty(SENSORS_PLUGINS): SENSORS_PLUGINS = sensorfw generic
 }
 
diff --git a/src/sensors/configure.json b/src/sensors/configure.json
new file mode 100644
index 0000000..633de2a
--- /dev/null
+++ b/src/sensors/configure.json
@@ -0,0 +1,32 @@
+{
+    "module": "sensors",
+
+    "libraries": {
+        "sensorfw": {
+            "label": "sensorfw",
+            "sources": [
+                { "type": "pkgConfig", "args": "sensord-qt5" }
+            ]
+        }
+    },
+
+    "features": {
+        "sensorfw": {
+            "label": "sensorfw",
+            "condition": "libs.sensorfw",
+            "output": [ "privateFeature" ]
+        }
+    },
+
+    "report": [
+    ],
+
+    "summary": [
+        {
+            "section": "Qt Sensors",
+            "entries": [
+                "sensorfw"
+            ]
+        }
+    ]
+}
diff --git a/src/sensors/doc/src/sensorfwbackend.qdoc b/src/sensors/doc/src/sensorfwbackend.qdoc
index 0ff31f8..c3189bb 100644
--- a/src/sensors/doc/src/sensorfwbackend.qdoc
+++ b/src/sensors/doc/src/sensorfwbackend.qdoc
@@ -33,9 +33,5 @@
     The Sensorfw sensor backend requires the Sensorfw and sensor daemon. Sensorfw
     was originally used in MeeGo, and is available on :
     https://github.com/mer-packages/sensorfw
-
-    To compile the sensorfw backend, you need sensorfw installed and run qmake
-    with CONFIG+=sensorfw
-
 */
 
-- 
cgit v1.2.1