diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-25 23:29:02 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-25 23:29:02 +0200 |
| commit | 9cc3a315e5ff6363958833dc77fc13e1672d3bb2 (patch) | |
| tree | acd2b2ab7baa8724e82db2329675e6bc18db0ea4 /examples | |
| parent | 5ae30e1ae8de41478476567148846a80cd508e7b (diff) | |
| parent | e26a41a51d4d414160346703ed0d05416c3987b5 (diff) | |
| download | qtsensors-9cc3a315e5ff6363958833dc77fc13e1672d3bb2.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I451682790ba1949c150d4045baf9df0cd467d486
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: |