diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-10 15:09:37 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 15:03:03 +0100 |
commit | 26c5243491f495194f04b449128dae36118e28da (patch) | |
tree | 7fb14678a6fc9e44a10c9224d005e2cbdc6bcb63 /src/imports/window | |
parent | 1c7d264e3b2e9a2f0021786ea6967185f8282af0 (diff) | |
parent | c24c5baeda4101b0058689adf9200b77a722c3a2 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
src/qml/qml/qqmlengine.cpp
Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
Diffstat (limited to 'src/imports/window')
-rw-r--r-- | src/imports/window/plugin.cpp | 8 | ||||
-rw-r--r-- | src/imports/window/plugin.h | 20 | ||||
-rw-r--r-- | src/imports/window/window.pro | 2 |
3 files changed, 23 insertions, 7 deletions
diff --git a/src/imports/window/plugin.cpp b/src/imports/window/plugin.cpp index ec4f2c5d2a..5152fa02ec 100644 --- a/src/imports/window/plugin.cpp +++ b/src/imports/window/plugin.cpp @@ -41,6 +41,8 @@ #include "plugin.h" +extern void qml_register_types_QtQuick_Window(); + QT_BEGIN_NAMESPACE /*! @@ -64,7 +66,11 @@ class QtQuick2WindowPlugin : public QQmlEngineExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlEngineExtensionInterface_iid) public: - QtQuick2WindowPlugin(QObject *parent = nullptr) : QQmlEngineExtensionPlugin(parent) { } + QtQuick2WindowPlugin(QObject *parent = nullptr) : QQmlEngineExtensionPlugin(parent) + { + volatile auto registration = &qml_register_types_QtQuick_Window; + Q_UNUSED(registration); + } }; //![class decl] diff --git a/src/imports/window/plugin.h b/src/imports/window/plugin.h index 9f58ca9ac7..625a77b12c 100644 --- a/src/imports/window/plugin.h +++ b/src/imports/window/plugin.h @@ -65,7 +65,7 @@ struct QWindowForeign Q_GADGET QML_FOREIGN(QWindow) QML_ANONYMOUS - QML_ADDED_IN_MINOR_VERSION(1) + QML_ADDED_IN_VERSION(2, 1) }; struct QQuickWindowForeign @@ -73,8 +73,8 @@ struct QQuickWindowForeign Q_GADGET QML_FOREIGN(QQuickWindow) QML_NAMED_ELEMENT(Window) - QML_ADDED_IN_MINOR_VERSION(0) - QML_REMOVED_IN_MINOR_VERSION(1) + QML_ADDED_IN_VERSION(2, 0) + QML_REMOVED_IN_VERSION(2, 1) }; struct QQuickWindowForeignAttached @@ -82,6 +82,7 @@ struct QQuickWindowForeignAttached Q_GADGET QML_FOREIGN(QQuickWindowAttached) QML_ANONYMOUS + QML_ADDED_IN_VERSION(2, 0) }; struct QQuickScreenInfoForeign @@ -89,7 +90,7 @@ struct QQuickScreenInfoForeign Q_GADGET QML_FOREIGN(QQuickScreenInfo) QML_NAMED_ELEMENT(ScreenInfo) - QML_ADDED_IN_MINOR_VERSION(3) + QML_ADDED_IN_VERSION(2, 3) QML_UNCREATABLE("ScreenInfo can only be used via the attached property.") }; @@ -98,6 +99,7 @@ struct QQuickScreenForeignAttached Q_GADGET QML_FOREIGN(QQuickScreenAttached) QML_ANONYMOUS + QML_ADDED_IN_VERSION(2, 0) }; struct QQuickScreenForeign @@ -105,6 +107,7 @@ struct QQuickScreenForeign Q_GADGET QML_FOREIGN(QQuickScreen) QML_NAMED_ELEMENT(Screen) + QML_ADDED_IN_VERSION(2, 0) QML_UNCREATABLE("Screen can only be used via the attached property.") }; @@ -113,7 +116,14 @@ struct QQuickWindowQmlImplForeign Q_GADGET QML_FOREIGN(QQuickWindowQmlImpl) QML_NAMED_ELEMENT(Window) - QML_ADDED_IN_MINOR_VERSION(1) + QML_ADDED_IN_VERSION(2, 1) +}; + +struct QQuickRootItemForeign +{ + Q_GADGET + QML_FOREIGN(QQuickRootItem) + QML_ANONYMOUS }; QT_END_NAMESPACE diff --git a/src/imports/window/window.pro b/src/imports/window/window.pro index 70af305937..d8f9b16df4 100644 --- a/src/imports/window/window.pro +++ b/src/imports/window/window.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = windowplugin TARGETPATH = QtQuick/Window -IMPORT_VERSION = 2.15 +QML_IMPORT_VERSION = $$QT_VERSION SOURCES += \ plugin.cpp |