diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-14 16:33:19 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 08:02:30 +0100 |
| commit | 8d25a4a58c47431c589d8cbbc82e442360cf7e63 (patch) | |
| tree | 14d4c0f123e602e8528298346f72df5debd2936c /src/plugins/sensorgestures/simulator | |
| parent | b6d87d1b5141987452bc30e8b1d4115998ba6fd9 (diff) | |
Use the new plugin mechanism for Sensors and SensorGestures
Plugins no longer use QFactoryInterface or Q_EXPORT_PLUGIN. Instead,
Q_PLUGIN_METADATA is used.
Meta-data is provided through a .json file that is embedded into the
plugin by moc.
For now, this meta-data is not actually used because both sensors
and gestures use a dynamic registration mechanism.
Change-Id: Ic82657e2ba5768127e13f7411ca51f60772781d8
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/plugins/sensorgestures/simulator')
4 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/sensorgestures/simulator/plugin.json b/src/plugins/sensorgestures/simulator/plugin.json new file mode 100644 index 00000000..8a55b3ae --- /dev/null +++ b/src/plugins/sensorgestures/simulator/plugin.json @@ -0,0 +1 @@ +{ "Keys": [ "notused" ] } diff --git a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp index a8d45a11..66dcd854 100644 --- a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp +++ b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp @@ -75,6 +75,3 @@ QList <QSensorGestureRecognizer *> QSimulatorSensorGesturePlugin::createRecogniz return recognizers; } - -Q_EXPORT_PLUGIN2(QSimulatorSensorGestureRecognizer, QSimulatorSensorGesturePlugin) - diff --git a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h index 9fe91bdd..4f598007 100644 --- a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h +++ b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h @@ -50,7 +50,8 @@ class QSimulatorSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - Q_INTERFACES(QSensorGesturePluginInterface:QFactoryInterface) + Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json") + Q_INTERFACES(QSensorGesturePluginInterface) public: explicit QSimulatorSensorGesturePlugin(); diff --git a/src/plugins/sensorgestures/simulator/simulator.pro b/src/plugins/sensorgestures/simulator/simulator.pro index 015d01f0..5f1712d1 100644 --- a/src/plugins/sensorgestures/simulator/simulator.pro +++ b/src/plugins/sensorgestures/simulator/simulator.pro @@ -21,4 +21,7 @@ SOURCES += \ qsimulatorrecognizer.cpp\ qsimulatorsensorgestureplugin.cpp +OTHER_FILES += \ + plugin.json + |