diff options
-rw-r--r-- | doc/src/qtsensors-backend.qdoc | 4 | ||||
-rw-r--r-- | tests/auto/qsensor/qsensor.pro | 1 | ||||
-rw-r--r-- | tests/auto/qsensor/test_sensorplugin.cpp | 14 |
3 files changed, 3 insertions, 16 deletions
diff --git a/doc/src/qtsensors-backend.qdoc b/doc/src/qtsensors-backend.qdoc index aec028a..bb4b4a1 100644 --- a/doc/src/qtsensors-backend.qdoc +++ b/doc/src/qtsensors-backend.qdoc @@ -78,10 +78,6 @@ An example follows. \snippet snippets/sensors/plugin.cpp Plugin -If you would like to build a backend into a library or application you can use the -REGISTER_STATIC_PLUGIN() macro although it may not work in all situations as it -uses static initialization. - */ /*! diff --git a/tests/auto/qsensor/qsensor.pro b/tests/auto/qsensor/qsensor.pro index b0e2d98..57b0573 100644 --- a/tests/auto/qsensor/qsensor.pro +++ b/tests/auto/qsensor/qsensor.pro @@ -3,6 +3,7 @@ TARGET = tst_qsensor CONFIG += testcase QT = core testlib sensors-private +DEFINES += QT_STATICPLUGIN SOURCES += \ tst_qsensor.cpp diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp index 6d78e90..848699e 100644 --- a/tests/auto/qsensor/test_sensorplugin.cpp +++ b/tests/auto/qsensor/test_sensorplugin.cpp @@ -54,7 +54,7 @@ class TestSensorPlugin : public QObject, public QSensorBackendFactory { Q_OBJECT - //Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0") Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) public: void registerSensors() @@ -107,16 +107,6 @@ public: } }; -// Logic stolen from qplugin.h -#define REGISTER_STATIC_PLUGIN_V2(pluginname) \ - static QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance() \ - Q_PLUGIN_INSTANCE(pluginname) \ - const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_##pluginname() { \ - QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance, 0 }; \ - return plugin; \ - }\ - Q_IMPORT_PLUGIN(pluginname) - -REGISTER_STATIC_PLUGIN_V2(TestSensorPlugin) +Q_IMPORT_PLUGIN(TestSensorPlugin) #include "test_sensorplugin.moc" |