diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2012-06-06 15:08:36 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 07:27:31 +0200 |
| commit | 44a568096fa0709af53fc5d9edeb3621bccf3e3f (patch) | |
| tree | bdf8414a28cf57898f8c479e1d1dae02e597abf5 | |
| parent | 9610e64f3efe591621548e90e64d0e21cbfaea98 (diff) | |
Fix plugin compilation errors related to qtbase plugin changes.
The qtfeedback plugin changes had been performed in checkin
9610e64f3efe591621548e90e64d0e21cbfaea98 . However this modification
did not take into consideration other test code. This changes moves
testplugin implementation to the newer style.
Change-Id: I5ec6f5cd52369d6a49ad28700fd5a4786a5fd765
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
6 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp index 0f7a0cd..797163a 100644 --- a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp +++ b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp @@ -49,8 +49,6 @@ #include <QtCore/QVariant> #include <QDebug> -Q_EXPORT_PLUGIN2(feedback_testplugin, QFeedbackTestPlugin) - QFeedbackTestPlugin::QFeedbackTestPlugin() : QObject(qApp), mHapticState(QFeedbackEffect::Stopped), mFileState(QFeedbackEffect::Stopped) { actuators_ << createFeedbackActuator(this, 0) << createFeedbackActuator(this, 1); diff --git a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.h b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.h index c3bd9e7..73fd89a 100644 --- a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.h +++ b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.h @@ -58,6 +58,7 @@ QT_USE_NAMESPACE class QFeedbackTestPlugin : public QObject, public QFeedbackHapticsInterface, public QFeedbackFileInterface, public QFeedbackThemeInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtFeedbackTestPlugin") Q_INTERFACES(QFeedbackHapticsInterface) Q_INTERFACES(QFeedbackFileInterface) Q_INTERFACES(QFeedbackThemeInterface) diff --git a/tests/auto/qfeedbackplugin/testplugin2/qfeedbacktestplugin.cpp b/tests/auto/qfeedbackplugin/testplugin2/qfeedbacktestplugin.cpp index 7522c4a..3de7d06 100644 --- a/tests/auto/qfeedbackplugin/testplugin2/qfeedbacktestplugin.cpp +++ b/tests/auto/qfeedbackplugin/testplugin2/qfeedbacktestplugin.cpp @@ -49,8 +49,6 @@ #include <QtCore/QVariant> #include <QDebug> -Q_EXPORT_PLUGIN2(feedback_atestplugin, QFeedbackTestPlugin) - QFeedbackTestPlugin::QFeedbackTestPlugin() : QObject(qApp) { diff --git a/tests/auto/qfeedbackplugin/testplugin2/qfeedbacktestplugin.h b/tests/auto/qfeedbackplugin/testplugin2/qfeedbacktestplugin.h index de24dd9..f0cbde2 100644 --- a/tests/auto/qfeedbackplugin/testplugin2/qfeedbacktestplugin.h +++ b/tests/auto/qfeedbackplugin/testplugin2/qfeedbacktestplugin.h @@ -57,6 +57,7 @@ QT_USE_NAMESPACE class QFeedbackTestPlugin : public QObject, public QFeedbackThemeInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtFeedbackTestPlugin2") Q_INTERFACES(QFeedbackThemeInterface) public: QFeedbackTestPlugin(); diff --git a/tests/auto/qfeedbackplugin/testplugin3/qfeedbacktestplugin.cpp b/tests/auto/qfeedbackplugin/testplugin3/qfeedbacktestplugin.cpp index b31065e..3de7d06 100644 --- a/tests/auto/qfeedbackplugin/testplugin3/qfeedbacktestplugin.cpp +++ b/tests/auto/qfeedbackplugin/testplugin3/qfeedbacktestplugin.cpp @@ -49,8 +49,6 @@ #include <QtCore/QVariant> #include <QDebug> -Q_EXPORT_PLUGIN2(feedback_testplugin3, QFeedbackTestPlugin) - QFeedbackTestPlugin::QFeedbackTestPlugin() : QObject(qApp) { diff --git a/tests/auto/qfeedbackplugin/testplugin3/qfeedbacktestplugin.h b/tests/auto/qfeedbackplugin/testplugin3/qfeedbacktestplugin.h index ddd32c8..910dd02 100644 --- a/tests/auto/qfeedbackplugin/testplugin3/qfeedbacktestplugin.h +++ b/tests/auto/qfeedbackplugin/testplugin3/qfeedbacktestplugin.h @@ -57,6 +57,7 @@ QT_USE_NAMESPACE class QFeedbackTestPlugin : public QObject, public QFeedbackThemeInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtFeedbackTestPlugin3") Q_INTERFACES(QFeedbackThemeInterface) public: QFeedbackTestPlugin(); |