[sensorfw] Use Q_OBJECT on all plugin classes to make them loadable.

moc needs Q_OBJECT before it parses Q_PLUGIN_METADATA, so this never worked.
sailfishos · Jun 13, 2013 · 2a18fdb · 2a18fdb
1 parent 1d8d00d
commit 2a18fdb
Show file tree

Hide file tree

Showing 42 changed files with 43 additions and 1 deletion.
diff --git a/adaptors/accelerometeradaptor/accelerometeradaptorplugin.h b/adaptors/accelerometeradaptor/accelerometeradaptorplugin.h
@@ -30,6 +30,7 @@
 
 class AccelerometerAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.h b/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.h
@@ -36,6 +36,7 @@
 
 class ALSAdaptorAsciiPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.h b/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.h
@@ -31,8 +31,9 @@
 
 class ALSAdaptorSysfsPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-        Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
+    Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif
 
 private:

diff --git a/adaptors/alsadaptor/alsadaptorplugin.h b/adaptors/alsadaptor/alsadaptorplugin.h
@@ -30,6 +30,7 @@
 
 class ALSAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.h b/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.h
@@ -31,6 +31,7 @@
 
 class GyroscopeAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/kbslideradaptor/kbslideradaptorplugin.h b/adaptors/kbslideradaptor/kbslideradaptorplugin.h
@@ -30,6 +30,7 @@
 
 class KeyboardSliderAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/magnetometeradaptor/magnetometeradaptorplugin.h b/adaptors/magnetometeradaptor/magnetometeradaptorplugin.h
@@ -30,6 +30,7 @@
 
 class MagnetometerAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.h b/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.h
@@ -29,6 +29,7 @@
 
 class MRSTAccelerometerAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.h b/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.h
@@ -5,6 +5,7 @@
 
 class OaktrailAccelerometerAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.h b/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.h
@@ -5,6 +5,7 @@
 
 class OemtabletAccelerometerAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.h b/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.h
@@ -5,6 +5,7 @@
 
 class OEMTabletALSAdaptorAsciiPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.h b/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.h
@@ -5,6 +5,7 @@
 
 class OEMTabletGyroscopeAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.h b/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.h
@@ -5,6 +5,7 @@
 
 class OemtabletMagnetometerAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.h b/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.h
@@ -5,6 +5,7 @@
 
 class PegatronAccelerometerAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.h b/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.h
@@ -35,6 +35,7 @@
 
 class ProximityAdaptorAsciiPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.h b/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.h
@@ -31,6 +31,7 @@
 
 class ProximityAdaptorEvdevPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/proximityadaptor/proximityadaptorplugin.h b/adaptors/proximityadaptor/proximityadaptorplugin.h
@@ -31,6 +31,7 @@
 
 class ProximityAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.h b/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.h
@@ -5,6 +5,7 @@
 
 class SteAccelerometerAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/tapadaptor/tapadaptorplugin.h b/adaptors/tapadaptor/tapadaptorplugin.h
@@ -30,6 +30,7 @@
 
 class TapAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/adaptors/touchadaptor/touchadaptorplugin.h b/adaptors/touchadaptor/touchadaptorplugin.h
@@ -30,6 +30,7 @@
 
 class TouchAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/chains/accelerometerchain/accelerometerchainplugin.h b/chains/accelerometerchain/accelerometerchainplugin.h
@@ -30,6 +30,7 @@
 
 class AccelerometerChainPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/chains/orientationchain/orientationchainplugin.h b/chains/orientationchain/orientationchainplugin.h
@@ -30,6 +30,7 @@
 
 class OrientationChainPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/examples/adaptorplugin/sampleadaptorplugin.h b/examples/adaptorplugin/sampleadaptorplugin.h
@@ -30,6 +30,7 @@
 
 class SampleAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/examples/chainplugin/samplechainplugin.h b/examples/chainplugin/samplechainplugin.h
@@ -30,6 +30,7 @@
 
 class SampleChainPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/examples/filterplugin/samplefilterplugin.h b/examples/filterplugin/samplefilterplugin.h
@@ -30,6 +30,7 @@
 
 class SampleFilterPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/examples/sensorplugin/sampleplugin.h b/examples/sensorplugin/sampleplugin.h
@@ -30,6 +30,7 @@
 
 class SamplePlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/filters/coordinatealignfilter/coordinatealignfilterplugin.h b/filters/coordinatealignfilter/coordinatealignfilterplugin.h
@@ -30,6 +30,7 @@
 
 class CoordinateAlignFilterPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/filters/declinationfilter/declinationfilterplugin.h b/filters/declinationfilter/declinationfilterplugin.h
@@ -30,6 +30,7 @@
 
 class DeclinationFilterPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/filters/downsamplefilter/downsamplefilterplugin.h b/filters/downsamplefilter/downsamplefilterplugin.h
@@ -30,6 +30,7 @@
 
 class DownsampleFilterPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/filters/orientationinterpreter/orientationinterpreterplugin.h b/filters/orientationinterpreter/orientationinterpreterplugin.h
@@ -30,6 +30,7 @@
 
 class OrientationInterpreterPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/filters/rotationfilter/rotationfilterplugin.h b/filters/rotationfilter/rotationfilterplugin.h
@@ -30,6 +30,7 @@
 
 class RotationFilterPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/sensors/accelerometersensor/accelerometerplugin.h b/sensors/accelerometersensor/accelerometerplugin.h
@@ -30,6 +30,7 @@
 
 class AccelerometerPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/sensors/alssensor/alsplugin.h b/sensors/alssensor/alsplugin.h
@@ -30,6 +30,7 @@
 
 class ALSPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/sensors/compasssensor/compassplugin.h b/sensors/compasssensor/compassplugin.h
@@ -30,6 +30,7 @@
 
 class CompassPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/sensors/contextplugin/contextplugin.h b/sensors/contextplugin/contextplugin.h
@@ -29,6 +29,7 @@
 
 class ContextPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/sensors/gyroscopesensor/gyroscopeplugin.h b/sensors/gyroscopesensor/gyroscopeplugin.h
@@ -31,6 +31,7 @@
 
 class GyroscopePlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/sensors/magnetometersensor/magnetometerplugin.h b/sensors/magnetometersensor/magnetometerplugin.h
@@ -30,6 +30,7 @@
 
 class MagnetometerPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/sensors/orientationsensor/orientationplugin.h b/sensors/orientationsensor/orientationplugin.h
@@ -30,6 +30,7 @@
 
 class OrientationPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/sensors/proximitysensor/proximityplugin.h b/sensors/proximitysensor/proximityplugin.h
@@ -30,6 +30,7 @@
 
 class ProximityPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/sensors/rotationsensor/rotationplugin.h b/sensors/rotationsensor/rotationplugin.h
@@ -30,6 +30,7 @@
 
 class RotationPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/sensors/tapsensor/tapplugin.h b/sensors/tapsensor/tapplugin.h
@@ -30,6 +30,7 @@
 
 class TapPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif

diff --git a/tests/benchmark/fakeadaptor/fakeadaptorplugin.h b/tests/benchmark/fakeadaptor/fakeadaptorplugin.h
@@ -30,6 +30,7 @@
 
 class FakeAdaptorPlugin : public Plugin
 {
+    Q_OBJECT
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
 #endif