diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-23 11:38:08 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-23 11:48:36 +0100 |
| commit | 0df03fe57b7af6606cd7e1a8a87f7c1f4f896323 (patch) | |
| tree | ea82ca40e5bc2b5acf6c75b7b3408faee7fd65cf | |
| parent | 39273e338bdb9f90f30111047f9baa8a6ab26697 (diff) | |
| download | qtscript-0df03fe57b7af6606cd7e1a8a87f7c1f4f896323.tar.gz | |
Use new plugin system in QtScript.
Add static plugin test and QtDBusScriptPlugin
which were left over (see
f1653db0f4b7ceba448a39dc16ba45c0f817ef5b).
Change-Id: Ifd1e13882f7e39ce724a6e94732b238255ce3128
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
6 files changed, 16 insertions, 5 deletions
diff --git a/src/plugins/script/qtdbus/main.cpp b/src/plugins/script/qtdbus/main.cpp index c1bb0df..37db668 100644 --- a/src/plugins/script/qtdbus/main.cpp +++ b/src/plugins/script/qtdbus/main.cpp @@ -351,6 +351,9 @@ Q_DECLARE_METATYPE(QDBusError) class QtDBusScriptPlugin : public QScriptExtensionPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QScriptExtensionInterface" FILE "qtdbusscriptplugin.json") + public: QStringList keys() const; void initialize(const QString &key, QScriptEngine *engine); @@ -393,8 +396,6 @@ void QtDBusScriptPlugin::initialize(const QString &key, QScriptEngine *engine) (void)new QScriptDBusMessageConstructor(engine, extensionObject); } - -Q_EXPORT_STATIC_PLUGIN(QtDBusScriptPlugin) -Q_EXPORT_PLUGIN2(qtscriptdbus, QtDBusScriptPlugin) +#include "main.moc" #endif // QT_NO_DBUS diff --git a/src/plugins/script/qtdbus/qtdbusscriptplugin.json b/src/plugins/script/qtdbus/qtdbusscriptplugin.json new file mode 100644 index 0000000..a98659f --- /dev/null +++ b/src/plugins/script/qtdbus/qtdbusscriptplugin.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "qt.dbus" ] +} diff --git a/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.cpp b/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.cpp index bb47947..064da4c 100644 --- a/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.cpp +++ b/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.cpp @@ -45,6 +45,9 @@ class StaticPlugin : public QScriptExtensionPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QScriptExtensionInterface" FILE "staticplugin.json") + public: StaticPlugin(QObject *parent = 0); ~StaticPlugin(); @@ -72,4 +75,4 @@ void StaticPlugin::initialize(const QString &key, QScriptEngine *engine) engine->globalObject().setProperty("pluginKey", key); } -Q_EXPORT_PLUGIN2(staticplugin, StaticPlugin) +#include "staticplugin.moc" diff --git a/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.json b/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.json new file mode 100644 index 0000000..0b7fffd --- /dev/null +++ b/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "static" ] +} diff --git a/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.pro b/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.pro index 65c4e8f..51b0a3b 100644 --- a/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.pro +++ b/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.pro @@ -4,5 +4,6 @@ CONFIG -= create_prl # not needed, and complicates debug/release SOURCES = staticplugin.cpp RESOURCES = staticplugin.qrc QT = core script +DEFINES += QT_STATICPLUGIN TARGET = staticplugin DESTDIR = ../plugins/script diff --git a/tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp b/tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp index a0f3138..52390f3 100644 --- a/tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp +++ b/tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp @@ -164,7 +164,7 @@ void tst_QScriptExtensionPlugin::importStaticPlugin() QVERIFY(!eng.globalObject().property("pluginKey").isValid()); } -Q_IMPORT_PLUGIN(staticplugin) +Q_IMPORT_PLUGIN(StaticPlugin) QTEST_MAIN(tst_QScriptExtensionPlugin) #include "tst_qscriptextensionplugin.moc" |