diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-08-26 12:48:21 +0200 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2016-08-30 15:14:16 +0000 |
| commit | 5b94fe36c9a35dab849517eab7319376648f7d95 (patch) | |
| tree | 4b4f06bd7513a5c726a8978f95f788639fd44d38 | |
| parent | f5e23333e851def3a556cb979ca77e6c7a9fb0bf (diff) | |
| download | qtwebkit-5b94fe36c9a35dab849517eab7319376648f7d95.tar.gz | |
Fix loading of QML plugins
Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader
is strict about requiring the correct interface id, to avoid loading
unrelated plugins in the loader thread (which they may not be prepared
to do).
Change-Id: If758dc34a68f07e916ef4a5f9f8aad97998ecc9d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | Source/WebKit/qt/declarative/experimental/plugin.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/declarative/plugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/qt/declarative/experimental/plugin.cpp b/Source/WebKit/qt/declarative/experimental/plugin.cpp index e6ffeda6e..66343af7c 100644 --- a/Source/WebKit/qt/declarative/experimental/plugin.cpp +++ b/Source/WebKit/qt/declarative/experimental/plugin.cpp @@ -45,7 +45,7 @@ public: class WebKitQmlExperimentalExtensionPlugin: public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") public: virtual void registerTypes(const char* uri) { diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp index 1aa00a900..2ffc8ea0f 100644 --- a/Source/WebKit/qt/declarative/plugin.cpp +++ b/Source/WebKit/qt/declarative/plugin.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE class WebKitQmlPlugin : public QQmlExtensionPlugin { - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") Q_OBJECT public: #if defined(HAVE_WEBKIT2) |