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/sensors | |
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/sensors')
-rw-r--r-- | src/plugins/sensors/dummy/dummy.pri | 9 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/dummy.pro | 11 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/main.cpp | 6 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/plugin.json | 1 | ||||
-rw-r--r-- | src/plugins/sensors/generic/generic.pri | 9 | ||||
-rw-r--r-- | src/plugins/sensors/generic/generic.pro | 10 | ||||
-rw-r--r-- | src/plugins/sensors/generic/main.cpp | 6 | ||||
-rw-r--r-- | src/plugins/sensors/generic/plugin.json | 1 | ||||
-rw-r--r-- | src/plugins/sensors/simulator/main.cpp | 6 | ||||
-rw-r--r-- | src/plugins/sensors/simulator/plugin.json | 1 | ||||
-rw-r--r-- | src/plugins/sensors/simulator/simulator.pro | 1 |
11 files changed, 29 insertions, 32 deletions
diff --git a/src/plugins/sensors/dummy/dummy.pri b/src/plugins/sensors/dummy/dummy.pri deleted file mode 100644 index 502081c7..00000000 --- a/src/plugins/sensors/dummy/dummy.pri +++ /dev/null @@ -1,9 +0,0 @@ -HEADERS += dummycommon.h\ - dummyaccelerometer.h\ - dummylightsensor.h\ - -SOURCES += dummycommon.cpp\ - dummyaccelerometer.cpp\ - dummylightsensor.cpp\ - main.cpp\ - diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro index b49c0be8..2cf13924 100644 --- a/src/plugins/sensors/dummy/dummy.pro +++ b/src/plugins/sensors/dummy/dummy.pro @@ -7,7 +7,16 @@ load(qt_plugin) DESTDIR = $$QT.sensors.plugins/sensors -include(dummy.pri) +HEADERS += dummycommon.h\ + dummyaccelerometer.h\ + dummylightsensor.h + +SOURCES += dummycommon.cpp\ + dummyaccelerometer.cpp\ + dummylightsensor.cpp\ + main.cpp + +OTHER_FILES = plugin.json unix:!mac:LIBS+=-lrt diff --git a/src/plugins/sensors/dummy/main.cpp b/src/plugins/sensors/dummy/main.cpp index b9aa7d2e..df69c5f9 100644 --- a/src/plugins/sensors/dummy/main.cpp +++ b/src/plugins/sensors/dummy/main.cpp @@ -50,7 +50,8 @@ class dummySensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory { Q_OBJECT - Q_INTERFACES(QSensorPluginInterface:QFactoryInterface) + Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_INTERFACES(QSensorPluginInterface) public: void registerSensors() { @@ -71,10 +72,7 @@ public: return 0; } - QStringList keys() const { return QStringList() << "dummy";} }; -Q_EXPORT_PLUGIN2(qtsensors_dummy, dummySensorPlugin) - #include "main.moc" diff --git a/src/plugins/sensors/dummy/plugin.json b/src/plugins/sensors/dummy/plugin.json new file mode 100644 index 00000000..8a55b3ae --- /dev/null +++ b/src/plugins/sensors/dummy/plugin.json @@ -0,0 +1 @@ +{ "Keys": [ "notused" ] } diff --git a/src/plugins/sensors/generic/generic.pri b/src/plugins/sensors/generic/generic.pri deleted file mode 100644 index 69efdc06..00000000 --- a/src/plugins/sensors/generic/generic.pri +++ /dev/null @@ -1,9 +0,0 @@ -HEADERS += genericorientationsensor.h\ - genericrotationsensor.h\ - genericalssensor.h - -SOURCES += genericorientationsensor.cpp\ - main.cpp\ - genericrotationsensor.cpp\ - genericalssensor.cpp - diff --git a/src/plugins/sensors/generic/generic.pro b/src/plugins/sensors/generic/generic.pro index 3d9e9cc4..c5b2bab7 100644 --- a/src/plugins/sensors/generic/generic.pro +++ b/src/plugins/sensors/generic/generic.pro @@ -7,8 +7,16 @@ load(qt_plugin) DESTDIR = $$QT.sensors.plugins/sensors -include(generic.pri) +HEADERS += genericorientationsensor.h\ + genericrotationsensor.h\ + genericalssensor.h +SOURCES += genericorientationsensor.cpp\ + main.cpp\ + genericrotationsensor.cpp\ + genericalssensor.cpp + +OTHER_FILES = plugin.json symbian { TARGET.EPOCALLOWDLLDATA = 1 diff --git a/src/plugins/sensors/generic/main.cpp b/src/plugins/sensors/generic/main.cpp index f8bd9f45..f0af75be 100644 --- a/src/plugins/sensors/generic/main.cpp +++ b/src/plugins/sensors/generic/main.cpp @@ -51,7 +51,8 @@ class genericSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorChangesInterface, public QSensorBackendFactory { Q_OBJECT - Q_INTERFACES(QSensorPluginInterface:QFactoryInterface QSensorChangesInterface) + Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) public: void registerSensors() { @@ -92,10 +93,7 @@ public: return 0; } - QStringList keys() const { return QStringList() << "generic";} }; -Q_EXPORT_PLUGIN2(qtsensors_generic, genericSensorPlugin) - #include "main.moc" diff --git a/src/plugins/sensors/generic/plugin.json b/src/plugins/sensors/generic/plugin.json new file mode 100644 index 00000000..8a55b3ae --- /dev/null +++ b/src/plugins/sensors/generic/plugin.json @@ -0,0 +1 @@ +{ "Keys": [ "notused" ] } diff --git a/src/plugins/sensors/simulator/main.cpp b/src/plugins/sensors/simulator/main.cpp index 3a81db29..65a1bced 100644 --- a/src/plugins/sensors/simulator/main.cpp +++ b/src/plugins/sensors/simulator/main.cpp @@ -53,7 +53,8 @@ class SimulatorSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory { Q_OBJECT - Q_INTERFACES(QSensorPluginInterface:QFactoryInterface) + Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_INTERFACES(QSensorPluginInterface) public: void registerSensors() { @@ -98,10 +99,7 @@ public: return 0; } - QStringList keys() const { return QStringList() << "simulator";} }; -Q_EXPORT_PLUGIN2(libsensors_simulator, SimulatorSensorPlugin) - #include "main.moc" diff --git a/src/plugins/sensors/simulator/plugin.json b/src/plugins/sensors/simulator/plugin.json new file mode 100644 index 00000000..8a55b3ae --- /dev/null +++ b/src/plugins/sensors/simulator/plugin.json @@ -0,0 +1 @@ +{ "Keys": [ "notused" ] } diff --git a/src/plugins/sensors/simulator/simulator.pro b/src/plugins/sensors/simulator/simulator.pro index f811170b..56bfb18f 100644 --- a/src/plugins/sensors/simulator/simulator.pro +++ b/src/plugins/sensors/simulator/simulator.pro @@ -35,3 +35,4 @@ SOURCES += \ qsensordata_simulator.cpp\ main.cpp +OTHER_FILES = plugin.json |