diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-09-30 18:33:12 -0700 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-11-07 08:52:25 +0000 |
| commit | 5bf1bd00335d0c95c54de426a02da2a98257fedb (patch) | |
| tree | eeb6a2e805640d7bc7a9e72041627076c3afd90f /src/plugins | |
| parent | 8065e461421ea17a942ea09d67aaa053a136a54e (diff) | |
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>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sensors/sensorfw/sensorfw.pro | 6 | ||||
| -rw-r--r-- | src/plugins/sensors/sensors.pro | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfw.pro b/src/plugins/sensors/sensorfw/sensorfw.pro index b30b3624..63a66117 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 af2fae10..76989335 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 } |