diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-08-26 11:59:33 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-31 12:50:54 +0000 |
| commit | f3a8486ffb9551818c7823b9e2d3ad09dab53b56 (patch) | |
| tree | 5c160f5c1ddbdc3a237bb12199f66eef23cf1ea3 | |
| parent | 3f73e47130f3912f99376314a06a2033225b0dda (diff) | |
Improve robustness of QML plugin loading
Use a variable that expands to the latest plugin version instead of
hard-coding the string.
Change-Id: Ie0a829fc5e1f3c6468d8ba7353913038106a424a
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | src/webengine/plugin/experimental/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/plugin/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/plugin/testsupport/plugin.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/webengine/plugin/experimental/plugin.cpp b/src/webengine/plugin/experimental/plugin.cpp index 23a81d79d..d9043f6d3 100644 --- a/src/webengine/plugin/experimental/plugin.cpp +++ b/src/webengine/plugin/experimental/plugin.cpp @@ -55,7 +55,7 @@ public: class QtWebEngineExperimentalPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: virtual void registerTypes(const char *uri) { diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp index d3f3712b4..e9312a92a 100644 --- a/src/webengine/plugin/plugin.cpp +++ b/src/webengine/plugin/plugin.cpp @@ -64,7 +64,7 @@ static QObject *webEngineSingletonProvider(QQmlEngine *, QJSEngine *) class QtWebEnginePlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: virtual void initializeEngine(QQmlEngine *engine, const char *uri) { diff --git a/src/webengine/plugin/testsupport/plugin.cpp b/src/webengine/plugin/testsupport/plugin.cpp index e1252361e..9352e3666 100644 --- a/src/webengine/plugin/testsupport/plugin.cpp +++ b/src/webengine/plugin/testsupport/plugin.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QtWebEngineTestSupportPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: virtual void registerTypes(const char *uri) { |