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 /tests | |
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 'tests')
-rw-r--r-- | tests/auto/qsensorgestures/plugins/test1/test1.pro | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qsensorgestures/plugins/test1/test1.pro b/tests/auto/qsensorgestures/plugins/test1/test1.pro index f35af0d..5f89068 100644 --- a/tests/auto/qsensorgestures/plugins/test1/test1.pro +++ b/tests/auto/qsensorgestures/plugins/test1/test1.pro @@ -2,11 +2,6 @@ TARGET = qtsensorgestures_testplugin1 QT += sensors sensorgestures -PLUGIN_TYPE = sensorgestures -PLUGIN_CLASS_NAME = QTestSensorGestureDupPlugin -PLUGIN_EXTENDS = - -load(qt_plugin) - # Input HEADERS += qtestsensorgestureplugindup_p.h \ qtestrecognizerdup.h \ @@ -16,3 +11,8 @@ SOURCES += qtestsensorgestureplugindup.cpp \ qtest2recognizerduo.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +PLUGIN_TYPE = sensorgestures +PLUGIN_CLASS_NAME = QTestSensorGestureDupPlugin +PLUGIN_EXTENDS = - +load(qt_plugin) |