diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 13:31:52 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 13:31:52 +0100 |
| commit | 1e470ee3fe914e811cfbfc104223bd230d084c74 (patch) | |
| tree | 1ab63e821b45af188e07831e10086f680f14567b /src/script/api/qscriptextensionplugin.cpp | |
| parent | 2124c1654f5e280870fb2bf6039d67a1cea2c1a9 (diff) | |
| parent | 4bffdf96b1418b011757bd1a7e8b6b109819a8fe (diff) | |
| download | qtscript-1e470ee3fe914e811cfbfc104223bd230d084c74.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: I5479b6eacc5366304d3d65c5287d9170b21a3c6c
Diffstat (limited to 'src/script/api/qscriptextensionplugin.cpp')
| -rw-r--r-- | src/script/api/qscriptextensionplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptextensionplugin.cpp b/src/script/api/qscriptextensionplugin.cpp index 4926ca5..f63cb4f 100644 --- a/src/script/api/qscriptextensionplugin.cpp +++ b/src/script/api/qscriptextensionplugin.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE Writing a script extension plugin is achieved by subclassing this base class, reimplementing the pure virtual keys() and initialize() - functions, and exporting the class using the Q_EXPORT_PLUGIN2() + functions, and exporting the class using the Q_PLUGIN_METADATA() macro. See \l {How to Create Qt Plugins} for details. \sa QScriptEngine::importExtension(), {Creating QtScript Extensions} @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE Constructs a script extension plugin with the given \a parent. Note that this constructor is invoked automatically by the - Q_EXPORT_PLUGIN2() macro, so there is no need for calling it + Q_PLUGIN_METADATA() macro, so there is no need for calling it explicitly. */ QScriptExtensionPlugin::QScriptExtensionPlugin(QObject *parent) |