From d16eefbeac6b34939d247ae6056fc4fbbea774c5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:37:39 +0100 Subject: consistently put {qt,qml}_{module,plugin} at the end of project files this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ia3c3f69505650fd35982fc76e385e744b877e4df Reviewed-by: Joerg Bornemann --- src/sensors/sensors.pro | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/sensors/sensors.pro') diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index a7f60e1..3e8754d 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -18,11 +18,6 @@ ANDROID_JAR_DEPENDENCIES = \ jar/QtSensors.jar:org.qtproject.qt5.android.sensors.QtSensors ANDROID_LIB_DEPENDENCIES = \ plugins/sensors/libqtsensors_android.so -MODULE_PLUGIN_TYPES = \ - sensors \ - sensorgestures - -load(qt_module) PUBLIC_HEADERS += \ qsensorbackend.h\ @@ -87,3 +82,8 @@ for(s,SENSORS) { } HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$GESTURE_HEADERS + +MODULE_PLUGIN_TYPES = \ + sensors \ + sensorgestures +load(qt_module) -- cgit v1.2.1 From 6c60edf84ddfd3cb23549730ccc70dfb7e1ee444 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:37:52 +0100 Subject: don't over-expose private dependencies Change-Id: I6045425fb467002db288854f9d0a8f8ea683876f Reviewed-by: Joerg Bornemann --- src/sensors/sensors.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sensors/sensors.pro') diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index 3e8754d..9eeceb8 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -7,7 +7,7 @@ CONFIG(debug,debug|release):DEFINES += ENABLE_RUNTIME_SENSORLOG qtHaveModule(simulator) { DEFINES += SIMULATOR_BUILD - QT += simulator + QT_FOR_PRIVATE += simulator } QMAKE_DOCS = $$PWD/doc/qtsensors.qdocconf -- cgit v1.2.1