diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-06-12 11:52:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 21:21:46 +0200 |
| commit | 9f5fa80c05d034876a2cf308cf1c825cd2bc772b (patch) | |
| tree | 3928a593499531afa06f74a9f441d54954bc18ec /tests/auto/qsensorgestures | |
| parent | cc6c449d5d7f7b606184ba8b6365456ad53a4a01 (diff) | |
Use static plugins properly
The test case was trying to use static plugins in a rather
hacky way. Change it over to use the standard way.
Change-Id: I828e64b841b58b763018e2688553c0453abd304b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/qsensorgestures')
6 files changed, 6 insertions, 26 deletions
diff --git a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp index eb245c03..b5c22ec5 100644 --- a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp +++ b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp @@ -106,15 +106,3 @@ 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/test/qtestsensorgestureplugin_p.h b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h index cf1ab32e..4801f1f8 100644 --- a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h +++ b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h @@ -48,7 +48,7 @@ class QTestSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - //Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface") Q_INTERFACES(QSensorGesturePluginInterface) public: diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp index 26bb9ae4..e0d551f5 100644 --- a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp +++ b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp @@ -104,15 +104,3 @@ 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) diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h index 18f4577a..e4ce72a6 100644 --- a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h +++ b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h @@ -48,7 +48,7 @@ class QTestSensorGestureDupPlugin : public QObject, public QSensorGesturePluginInterface { Q_OBJECT - //Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface") Q_INTERFACES(QSensorGesturePluginInterface) public: diff --git a/tests/auto/qsensorgestures/qsensorgestures.pro b/tests/auto/qsensorgestures/qsensorgestures.pro index 5bccd762..e3b152c7 100644 --- a/tests/auto/qsensorgestures/qsensorgestures.pro +++ b/tests/auto/qsensorgestures/qsensorgestures.pro @@ -1,6 +1,7 @@ TEMPLATE = app TARGET = tst_qsensorgesturetest CONFIG += testcase +DEFINES += QT_STATICPLUGIN QT += core testlib sensors QT -= gui diff --git a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp index bd7d3354..00e8cc42 100644 --- a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp +++ b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp @@ -51,6 +51,9 @@ #include <qsensorgesturerecognizer.h> #include <qsensorgestureplugininterface.h> +Q_IMPORT_PLUGIN(QTestSensorGesturePlugin) +Q_IMPORT_PLUGIN(QTestSensorGestureDupPlugin) + static QString removeParens(const QString &arg) { return arg.left(arg.indexOf("(")); |