diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-17 12:49:33 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 16:46:43 +0100 |
| commit | 1c0f03e0a04a21ca2915536c70f38654d76609e0 (patch) | |
| tree | 682fbe6cc649f8f717760900e951e016a53bc6bf | |
| parent | c8c1e22c0ba562de2d9a150fd5255b9d020848f2 (diff) | |
| download | qtscript-1c0f03e0a04a21ca2915536c70f38654d76609e0.tar.gz | |
Use new plugins system in Qt Script.
Change-Id: Ie28cc00899abaa3f42a0f43ed199e3c14d45df3e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
4 files changed, 12 insertions, 7 deletions
diff --git a/src/script/api/qscriptextensioninterface.h b/src/script/api/qscriptextensioninterface.h index f466666..6430485 100644 --- a/src/script/api/qscriptextensioninterface.h +++ b/src/script/api/qscriptextensioninterface.h @@ -41,8 +41,9 @@ struct Q_SCRIPT_EXPORT QScriptExtensionInterface virtual void initialize(const QString &key, QScriptEngine *engine) = 0; }; -Q_DECLARE_INTERFACE(QScriptExtensionInterface, - "com.trolltech.Qt.QScriptExtensionInterface/1.0") +#define QScriptExtensionInterface_iid "org.qt-project.Qt.QScriptExtensionInterface" + +Q_DECLARE_INTERFACE(QScriptExtensionInterface, QScriptExtensionInterface_iid) QT_END_NAMESPACE diff --git a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.cpp b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.cpp index bdcb532..47e9e21 100644 --- a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.cpp +++ b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.cpp @@ -45,6 +45,10 @@ class SimplePlugin : public QScriptExtensionPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.org.qt-project.Qt.QScriptExtensionInterface" FILE "simpleplugin.json") + Q_INTERFACES(QScriptExtensionInterface) + public: SimplePlugin(QObject *parent = 0); ~SimplePlugin(); @@ -76,4 +80,4 @@ void SimplePlugin::initialize(const QString &key, QScriptEngine *engine) engine->globalObject().setProperty("package", package); } -Q_EXPORT_PLUGIN2(simpleplugin, SimplePlugin) +#include "simpleplugin.moc" diff --git a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.json b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.json new file mode 100644 index 0000000..ec6eae2 --- /dev/null +++ b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "simple", "simple.foo", "simple.foo.bar" ] +} diff --git a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro index e184ca4..1fa9ee4 100644 --- a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro +++ b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro @@ -1,10 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = simpleplugin.cpp +OTHER_FILES += simpleplugin.json QT = core script TARGET = simpleplugin DESTDIR = ../plugins/script - -symbian { - TARGET.EPOCALLOWDLLDATA=1 -} |