summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-25 23:29:02 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-25 23:29:02 +0200
commit9cc3a315e5ff6363958833dc77fc13e1672d3bb2 (patch)
treeacd2b2ab7baa8724e82db2329675e6bc18db0ea4 /src/plugins
parent5ae30e1ae8de41478476567148846a80cd508e7b (diff)
parente26a41a51d4d414160346703ed0d05416c3987b5 (diff)
downloadqtsensors-9cc3a315e5ff6363958833dc77fc13e1672d3bb2.tar.gz
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I451682790ba1949c150d4045baf9df0cd467d486
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sensorgestures/qtsensors/plugin.json1
-rw-r--r--src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h2
-rw-r--r--src/plugins/sensorgestures/shake/plugin.json1
-rw-r--r--src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h2
4 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/plugin.json b/src/plugins/sensorgestures/qtsensors/plugin.json
deleted file mode 100644
index 8a55b3a..0000000
--- a/src/plugins/sensorgestures/qtsensors/plugin.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "Keys": [ "notused" ] }
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
index 5980a49..848a4f0 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
+++ b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
class QtSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface" FILE "plugin.json")
+ Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface")
Q_INTERFACES(QSensorGesturePluginInterface)
public:
diff --git a/src/plugins/sensorgestures/shake/plugin.json b/src/plugins/sensorgestures/shake/plugin.json
deleted file mode 100644
index 8a55b3a..0000000
--- a/src/plugins/sensorgestures/shake/plugin.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "Keys": [ "notused" ] }
diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
index 7b95064..ea69dd0 100644
--- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
+++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h
@@ -50,7 +50,7 @@
class QShakeSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface" FILE "plugin.json")
+ Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface")
Q_INTERFACES(QSensorGesturePluginInterface)
public: