diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-17 21:07:34 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-18 20:15:34 +0000 |
| commit | 82310bc78b5c52bfe0a2eca5d3a67bdfc81d1dd9 (patch) | |
| tree | 190707f98e9ca5360cbaa7d3a1edb1398db185bc /src/imports | |
| parent | d0748129835e5977c144874e5ccaf8a7e4fb0b54 (diff) | |
ApplicationWindow: fix access to revisioned members in base classes
The inheritance hierarcy is:
QWindow <- QQuickWindow <- QQuickWindowQmlImpl <- QQuickAppWindow
Each base class has its own set of revisioned members. Import the
revisioned members in the base classes to the templates/controls
namespace by calling qmlRegisterRevision() with the revision of the
base class and the respective templates/controls version.
Task-number: QTBUG-60893
Change-Id: I6d91209dc5b2eb17c2b3845675a5ddbffb7e8b72
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports')
4 files changed, 5 insertions, 2 deletions
diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml index 1dd39279..af3986ac 100644 --- a/src/imports/controls/ApplicationWindow.qml +++ b/src/imports/controls/ApplicationWindow.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.9 +import QtQuick.Window 2.3 import QtQuick.Controls 2.2 import QtQuick.Controls.impl 2.2 -import QtQuick.Window 2.2 import QtQuick.Templates 2.2 as T T.ApplicationWindow { diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml index 82a0d135..0d56ed2c 100644 --- a/src/imports/controls/material/ApplicationWindow.qml +++ b/src/imports/controls/material/ApplicationWindow.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.9 -import QtQuick.Window 2.2 +import QtQuick.Window 2.3 import QtQuick.Templates 2.2 as T import QtQuick.Controls.Material 2.2 diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml index a9d03c8c..3f3926de 100644 --- a/src/imports/controls/universal/ApplicationWindow.qml +++ b/src/imports/controls/universal/ApplicationWindow.qml @@ -35,6 +35,7 @@ ****************************************************************************/ import QtQuick 2.9 +import QtQuick.Window 2.3 import QtQuick.Templates 2.2 as T import QtQuick.Controls.Universal 2.2 import QtQuick.Controls.Universal.impl 2.2 diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index e7cb8540..263d7fde 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -213,6 +213,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterRevision<QQuickText, 6>(uri, 2, 0); qmlRegisterRevision<QQuickTextInput, 7>(uri, 2, 0); qmlRegisterRevision<QQuickTextEdit, 7>(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"); @@ -260,6 +261,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); } QT_END_NAMESPACE |