diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-06-13 09:32:19 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-13 01:46:58 +0200 |
| commit | 3cdcfb655b7c696413ab0e14ebaada58638f7e4a (patch) | |
| tree | a4a259e8b2187b2a227dafc2b64a21fd5155427b /tests/auto | |
| parent | 8bfeec609fa39b6a4d3626569eeaf90e28b89783 (diff) | |
Fix another bad use of static plugins.
Change-Id: I88bbe0ffe7768576df92a1d8e45097f7c35c5702
Reviewed-by: Zsolt Simon <zsolt.simon@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qsensor/qsensor.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qsensor/test_sensorplugin.cpp | 14 |
2 files changed, 3 insertions, 12 deletions
diff --git a/tests/auto/qsensor/qsensor.pro b/tests/auto/qsensor/qsensor.pro index b0e2d981..57b05736 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 6d78e905..848699e1 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" |