diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-26 12:13:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-26 14:31:11 +0000 |
| commit | ed90226834f8d4ef76149e995e2aecff68e4df43 (patch) | |
| tree | 06021c7a1ac3e30f9584359200206c717229c056 /src/qml/qml/qqmlextensioninterface.h | |
| parent | 5952cb93cc93702124aaa5dec938581b0312761a (diff) | |
Fix loading of QML plugins with old IID in static builds
After commit 709f6370884b110def2e4665df8fa7bbf5fae734 we required the
use of QQmlExtensionInterface_iid in qml plugins for static linkage.
This mean that plugins using the "/1.0" variant would also continue to
load, but those not would fail to load. This is annoying when porting
apps from older Qt versions.
To make the upgrade path easier, let's just support both IIDs.
[ChangeLog][Qml] Fix loading of static qml plugins using the old plugin
interface id
Change-Id: I1c662b1fedad3f32b7dea1eddc32838d2eb9f3be
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlextensioninterface.h')
| -rw-r--r-- | src/qml/qml/qqmlextensioninterface.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlextensioninterface.h b/src/qml/qml/qqmlextensioninterface.h index ef56d5e312..62b9b26569 100644 --- a/src/qml/qml/qqmlextensioninterface.h +++ b/src/qml/qml/qqmlextensioninterface.h @@ -66,7 +66,10 @@ public: Q_DECLARE_INTERFACE(QQmlTypesExtensionInterface, "org.qt-project.Qt.QQmlTypesExtensionInterface/1.0") +// NOTE: When changing this to a new version and deciding to add backup code to +// continue to support the previous version, make sure to support both of these iids. #define QQmlExtensionInterface_iid "org.qt-project.Qt.QQmlExtensionInterface/1.0" +#define QQmlExtensionInterface_iid_old "org.qt-project.Qt.QQmlExtensionInterface" Q_DECLARE_INTERFACE(QQmlExtensionInterface, QQmlExtensionInterface_iid) |