diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-20 11:11:42 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-20 11:11:42 +0200 |
| commit | eb70f8179628fe1298ff8fa0032589513e28e303 (patch) | |
| tree | 690140ebca31c20480c358317fd41541ef26d07b /src/imports/templates | |
| parent | ea043d5d838f638e4bc5461aa23fb69a1a9e1eb6 (diff) | |
| parent | edded3b5179de4e387f8bb173311bf39df9c43d7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/ApplicationWindow.qml
src/imports/controls/material/ApplicationWindow.qml
src/imports/controls/universal/ApplicationWindow.qml
src/imports/templates/qtquicktemplates2plugin.cpp
Change-Id: I9041c69f4ce5dab1d1b994d2318feddb696e56bf
Diffstat (limited to 'src/imports/templates')
| -rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index e9f21378..9f74a012 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -216,6 +216,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterRevision<QQuickTextInput, 7>(uri, 2, 0); qmlRegisterRevision<QQuickTextEdit, 7>(uri, 2, 0); qmlRegisterRevision<QQuickWindow, 2>(uri, 2, 0); + qmlRegisterRevision<QWindow, 3>(uri, 2, 0); // QtQuick.Templates 2.1 (new types and revisions in Qt 5.8) qmlRegisterType<QQuickButtonGroup, 1>(uri, 2, 1, "ButtonGroup"); @@ -263,6 +264,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) // make revisioned properties available to their subclasses (synced with Qt 5.9) qmlRegisterRevision<QQuickText, 9>(uri, 2, 2); qmlRegisterRevision<QQuickTextInput, 9>(uri, 2, 2); + qmlRegisterRevision<QQuickWindowQmlImpl, 2>(uri, 2, 2); // QtQuick.Templates 2.3 (new types and revisions in Qt 5.10) qmlRegisterType<QQuickAbstractButton, 3>(uri, 2, 3, "AbstractButton"); |