diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 20:57:59 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 20:58:15 +0200 |
commit | bbc476ecb97713ef88f7ff8be4f5f0131caabd1b (patch) | |
tree | c6580b8315aaa5ad0f0bad3843fa10dbab3d0ae1 /examples | |
parent | 660b931615211cc85c0086448409c43526c6f85f (diff) | |
parent | 0862901b142f36e91b98dbdcb2c36585020bb33d (diff) | |
download | qtsensors-bbc476ecb97713ef88f7ff8be4f5f0131caabd1b.tar.gz |
Merge branch 'stable' into dev
Change-Id: Id44a93ddf8dc778f44e9684842a759d585558ee4
Diffstat (limited to 'examples')
-rw-r--r-- | examples/sensors/qmlsensorgestures/plugin/plugin.json | 1 | ||||
-rw-r--r-- | examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.json b/examples/sensors/qmlsensorgestures/plugin/plugin.json deleted file mode 100644 index 8a55b3a..0000000 --- a/examples/sensors/qmlsensorgestures/plugin/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{ "Keys": [ "notused" ] } diff --git a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h index 0daa743..7092aec 100644 --- a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h +++ b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h @@ -49,7 +49,7 @@ class QCounterGesturePlugin : 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: |