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/plugins/sensors/dummy | |
| parent | 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 (diff) | |
| parent | 1e42bf9e28ee0578277047735a5be24fc68abb2c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/sensors/doc/src/compatmap.qdoc
Change-Id: I7bd464cbd506f630798091fef3896050ade7b3f8
Diffstat (limited to 'src/plugins/sensors/dummy')
| -rw-r--r-- | src/plugins/sensors/dummy/dummy.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro index 93f54dc0..b4ef2fda 100644 --- a/src/plugins/sensors/dummy/dummy.pro +++ b/src/plugins/sensors/dummy/dummy.pro @@ -1,10 +1,6 @@ TARGET = qtsensors_dummy QT = sensors core -PLUGIN_TYPE = sensors -PLUGIN_CLASS_NAME = dummySensorPlugin -load(qt_plugin) - HEADERS += dummycommon.h\ dummyaccelerometer.h\ dummylightsensor.h @@ -17,3 +13,7 @@ SOURCES += dummycommon.cpp\ OTHER_FILES = plugin.json unix:!mac:!qnx:!android:LIBS+=-lrt + +PLUGIN_TYPE = sensors +PLUGIN_CLASS_NAME = dummySensorPlugin +load(qt_plugin) |