diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:29:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:29:44 +0100 |
| commit | f8e256271f919c36c8d97eae27b1d11678294e70 (patch) | |
| tree | 774152d663a540dbf0ceb2f1ccb8385842a6e471 /src/sensors/sensors.pro | |
| parent | 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 (diff) | |
| parent | 1e42bf9e28ee0578277047735a5be24fc68abb2c (diff) | |
| download | qtsensors-f8e256271f919c36c8d97eae27b1d11678294e70.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/sensors/doc/src/compatmap.qdoc
Change-Id: I7bd464cbd506f630798091fef3896050ade7b3f8
Diffstat (limited to 'src/sensors/sensors.pro')
| -rw-r--r-- | src/sensors/sensors.pro | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index a7f60e1..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 @@ -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) |