diff options
Diffstat (limited to 'tests')
3 files changed, 31 insertions, 2 deletions
diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp index ccd67146..6633bf8c 100644 --- a/tests/auto/qsensor/test_sensorplugin.cpp +++ b/tests/auto/qsensor/test_sensorplugin.cpp @@ -108,6 +108,16 @@ 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) class LegacySensorPlugin : public QSensorPluginInterface @@ -121,7 +131,6 @@ public: }; -REGISTER_STATIC_PLUGIN_V1(LegacySensorPlugin) +REGISTER_STATIC_PLUGIN(LegacySensorPlugin) #include "test_sensorplugin.moc" - diff --git a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp index 72df2008..eb245c03 100644 --- a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp +++ b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp @@ -107,4 +107,14 @@ QString QTestSensorGesturePlugin::name() const return "TestGestures"; } +// 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(QTestSensorGesturePlugin) diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp index 4413f9e1..26bb9ae4 100644 --- a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp +++ b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp @@ -105,4 +105,14 @@ QString QTestSensorGestureDupPlugin::name() const return "TestGesturesDup"; } +// 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(QTestSensorGestureDupPlugin) |