From 3cdcfb655b7c696413ab0e14ebaada58638f7e4a Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Wed, 13 Jun 2012 09:32:19 +1000 Subject: Fix another bad use of static plugins. Change-Id: I88bbe0ffe7768576df92a1d8e45097f7c35c5702 Reviewed-by: Zsolt Simon --- tests/auto/qsensor/qsensor.pro | 1 + tests/auto/qsensor/test_sensorplugin.cpp | 14 ++------------ 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'tests/auto') 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" -- cgit v1.2.3