diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-04 13:52:18 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-15 16:56:10 +0200 |
| commit | 828cdcabf84734a753e3ba8b8e4b089a6e155415 (patch) | |
| tree | 0bad81fccdc270b28988dc4dc27d047f0354b8c7 /examples | |
| parent | f2378620e1616a7ec1b277b57da9176ccb7828ae (diff) | |
Remove QtQuick.Window plugin
We move all the types into QtQuick itself and retain QtQuick.Window only
as alias to QtQuick. This requires support for qmldirs that consist of
only an import statement.
[ChangeLog][QtQuick][Important Behavior Changes] The contents of the
QtQuick.Window QML module have been moved into the QtQuick module.
QtQuick.Window is merely and alias for QtQuick now. An explicit import
of QtQuick will override this alias. Therefore, if you import QtQuick
with a different version than QtQuick.Window, you will get the
QtQuick.Window types of the version given in the QtQuick import now.
Task-number: QTBUG-84639
Change-Id: Ia82afab0ac2faba70cfdaf53dc8dfe4261e1113f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/window/AllScreens.qml | 3 | ||||
| -rw-r--r-- | examples/quick/window/CurrentScreen.qml | 3 | ||||
| -rw-r--r-- | examples/quick/window/Splash.qml | 3 | ||||
| -rw-r--r-- | examples/quick/window/window.qml | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/examples/quick/window/AllScreens.qml b/examples/quick/window/AllScreens.qml index 0cec36c0ab..4050c09870 100644 --- a/examples/quick/window/AllScreens.qml +++ b/examples/quick/window/AllScreens.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -49,7 +49,6 @@ ****************************************************************************/ import QtQuick 2.3 -import QtQuick.Window 2.3 import "../shared" as Shared Column { diff --git a/examples/quick/window/CurrentScreen.qml b/examples/quick/window/CurrentScreen.qml index 563cca32a5..df5e876b3d 100644 --- a/examples/quick/window/CurrentScreen.qml +++ b/examples/quick/window/CurrentScreen.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -49,7 +49,6 @@ ****************************************************************************/ import QtQuick 2.3 -import QtQuick.Window 2.10 import "../shared" as Shared Item { diff --git a/examples/quick/window/Splash.qml b/examples/quick/window/Splash.qml index b33ad6c168..a6f70a59ef 100644 --- a/examples/quick/window/Splash.qml +++ b/examples/quick/window/Splash.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -49,7 +49,6 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Window 2.1 //! [splash-properties] Window { diff --git a/examples/quick/window/window.qml b/examples/quick/window/window.qml index 4280b6a4c0..499c9935f7 100644 --- a/examples/quick/window/window.qml +++ b/examples/quick/window/window.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -49,7 +49,6 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Window 2.3 import "../shared" as Shared QtObject { |