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/sensorgestures | |
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/plugins/sensorgestures')
-rw-r--r-- | src/plugins/sensorgestures/qtsensors/qtsensors.pro | 9 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/shake.pro | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro index 3f8df03..44f18ff 100644 --- a/src/plugins/sensorgestures/qtsensors/qtsensors.pro +++ b/src/plugins/sensorgestures/qtsensors/qtsensors.pro @@ -1,11 +1,6 @@ TARGET = qtsensorgestures_plugin QT = core sensors -PLUGIN_TYPE = sensorgestures -PLUGIN_CLASS_NAME = QtSensorGesturePlugin -PLUGIN_EXTENDS = - -load(qt_plugin) - # Input HEADERS += qtsensorgestureplugin.h \ qcoversensorgesturerecognizer.h \ @@ -36,3 +31,7 @@ SOURCES += qtsensorgestureplugin.cpp \ OTHER_FILES += \ plugin.json +PLUGIN_TYPE = sensorgestures +PLUGIN_CLASS_NAME = QtSensorGesturePlugin +PLUGIN_EXTENDS = - +load(qt_plugin) diff --git a/src/plugins/sensorgestures/shake/shake.pro b/src/plugins/sensorgestures/shake/shake.pro index d7d8f92..efa2a0c 100644 --- a/src/plugins/sensorgestures/shake/shake.pro +++ b/src/plugins/sensorgestures/shake/shake.pro @@ -1,11 +1,6 @@ TARGET = qtsensorgestures_shakeplugin QT = core sensors -PLUGIN_TYPE = sensorgestures -PLUGIN_CLASS_NAME = QShakeSensorGesturePlugin -PLUGIN_EXTENDS = - -load(qt_plugin) - # Input HEADERS += qshakesensorgestureplugin.h \ qshakerecognizer.h @@ -15,3 +10,7 @@ SOURCES += qshakesensorgestureplugin.cpp \ OTHER_FILES += \ plugin.json +PLUGIN_TYPE = sensorgestures +PLUGIN_CLASS_NAME = QShakeSensorGesturePlugin +PLUGIN_EXTENDS = - +load(qt_plugin) |