aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickpopup
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-03-26 17:01:51 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-08-26 11:46:00 +0200
commitd451cab0c8b727fa7f12a169a3d6ee449a3a1902 (patch)
tree8ce125b91fa050fdc0e9f0a1b95408fa5ab74f9d /tests/auto/qquickpopup
parent44847322109bd237498f3f74c4784bf27757a810 (diff)
Remove all version numbers from QML imports
As of Qt 6, the latest version will be used by default. This saves us a lot of effort in terms of version bumps. Task-number: QTBUG-82922 Change-Id: I74eba8185ec3ccc75bc293d4b2ea87d59e2d9928 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/qquickpopup')
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose1.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose2.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose3.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow-hover.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow-wheel.qml6
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml4
-rw-r--r--tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml4
-rw-r--r--tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml6
-rw-r--r--tests/auto/qquickpopup/data/countChanged.qml6
-rw-r--r--tests/auto/qquickpopup/data/cursor.qml4
-rw-r--r--tests/auto/qquickpopup/data/dialog.qml6
-rw-r--r--tests/auto/qquickpopup/data/disabledPalette.qml4
-rw-r--r--tests/auto/qquickpopup/data/grabber.qml4
-rw-r--r--tests/auto/qquickpopup/data/invisibleToolTipOpen.qml6
-rw-r--r--tests/auto/qquickpopup/data/nested.qml4
-rw-r--r--tests/auto/qquickpopup/data/orientation.qml6
-rw-r--r--tests/auto/qquickpopup/data/tabFence.qml8
-rw-r--r--tests/auto/qquickpopup/data/toolTipCrashOnClose.qml8
-rw-r--r--tests/auto/qquickpopup/data/window-hover.qml6
-rw-r--r--tests/auto/qquickpopup/data/window-wheel.qml6
-rw-r--r--tests/auto/qquickpopup/data/window.qml6
23 files changed, 59 insertions, 59 deletions
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
index ed9b65e1..9a76ebea 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
index d089fbbb..6d004b17 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml
index 20bd7941..8a682468 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml b/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
index 56cf85b6..adf23637 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClosingSeveralPopups.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.13
-import QtQuick.Controls 2.13
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/applicationwindow-hover.qml b/tests/auto/qquickpopup/data/applicationwindow-hover.qml
index 7b688147..80b22e6d 100644
--- a/tests/auto/qquickpopup/data/applicationwindow-hover.qml
+++ b/tests/auto/qquickpopup/data/applicationwindow-hover.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml
index de27d7ec..8d3f7f95 100644
--- a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml
+++ b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickpopup/data/applicationwindow.qml b/tests/auto/qquickpopup/data/applicationwindow.qml
index 3ce8a718..7a298d96 100644
--- a/tests/auto/qquickpopup/data/applicationwindow.qml
+++ b/tests/auto/qquickpopup/data/applicationwindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml b/tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
index 076e2230..aa25863a 100644
--- a/tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
+++ b/tests/auto/qquickpopup/data/centerInOverlayWithinStackViewItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
index 4f18fc13..71ec4e2b 100644
--- a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
+++ b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml b/tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
index b9606eb2..b65e4ec0 100644
--- a/tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
+++ b/tests/auto/qquickpopup/data/closeOnEscapeWithVisiblePopup.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.13
-import QtQuick.Window 2.13
-import QtQuick.Controls 2.13
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
width: 400
diff --git a/tests/auto/qquickpopup/data/countChanged.qml b/tests/auto/qquickpopup/data/countChanged.qml
index ee5876d7..fd594332 100644
--- a/tests/auto/qquickpopup/data/countChanged.qml
+++ b/tests/auto/qquickpopup/data/countChanged.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
width: 640
diff --git a/tests/auto/qquickpopup/data/cursor.qml b/tests/auto/qquickpopup/data/cursor.qml
index 4391f7a0..e2a6e38e 100644
--- a/tests/auto/qquickpopup/data/cursor.qml
+++ b/tests/auto/qquickpopup/data/cursor.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/dialog.qml b/tests/auto/qquickpopup/data/dialog.qml
index ee1b6bde..75c0e1c6 100644
--- a/tests/auto/qquickpopup/data/dialog.qml
+++ b/tests/auto/qquickpopup/data/dialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Item {
width: 400
diff --git a/tests/auto/qquickpopup/data/disabledPalette.qml b/tests/auto/qquickpopup/data/disabledPalette.qml
index f080f5e8..f1608aae 100644
--- a/tests/auto/qquickpopup/data/disabledPalette.qml
+++ b/tests/auto/qquickpopup/data/disabledPalette.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/grabber.qml b/tests/auto/qquickpopup/data/grabber.qml
index 6a6d6d65..507cc3b5 100644
--- a/tests/auto/qquickpopup/data/grabber.qml
+++ b/tests/auto/qquickpopup/data/grabber.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/invisibleToolTipOpen.qml b/tests/auto/qquickpopup/data/invisibleToolTipOpen.qml
index 2e58bb97..aaed154b 100644
--- a/tests/auto/qquickpopup/data/invisibleToolTipOpen.qml
+++ b/tests/auto/qquickpopup/data/invisibleToolTipOpen.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.13
-import QtQuick.Window 2.13
-import QtQuick.Controls 2.13
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
width: 400
diff --git a/tests/auto/qquickpopup/data/nested.qml b/tests/auto/qquickpopup/data/nested.qml
index 4ebdfb0c..03269cd1 100644
--- a/tests/auto/qquickpopup/data/nested.qml
+++ b/tests/auto/qquickpopup/data/nested.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/orientation.qml b/tests/auto/qquickpopup/data/orientation.qml
index a1cc9c0e..9730a9e1 100644
--- a/tests/auto/qquickpopup/data/orientation.qml
+++ b/tests/auto/qquickpopup/data/orientation.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
width: 600
diff --git a/tests/auto/qquickpopup/data/tabFence.qml b/tests/auto/qquickpopup/data/tabFence.qml
index 2cf408e9..ce5b5417 100644
--- a/tests/auto/qquickpopup/data/tabFence.qml
+++ b/tests/auto/qquickpopup/data/tabFence.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml b/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml
index 8de14f4c..33452182 100644
--- a/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml
+++ b/tests/auto/qquickpopup/data/toolTipCrashOnClose.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.13
-import QtQuick.Window 2.13
-import QtQuick.Controls 2.13
-import QtGraphicalEffects 1.13
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtGraphicalEffects
Window {
width: 640
diff --git a/tests/auto/qquickpopup/data/window-hover.qml b/tests/auto/qquickpopup/data/window-hover.qml
index 0bf00660..e0eef302 100644
--- a/tests/auto/qquickpopup/data/window-hover.qml
+++ b/tests/auto/qquickpopup/data/window-hover.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
width: 400
diff --git a/tests/auto/qquickpopup/data/window-wheel.qml b/tests/auto/qquickpopup/data/window-wheel.qml
index 37edee95..e476a1eb 100644
--- a/tests/auto/qquickpopup/data/window-wheel.qml
+++ b/tests/auto/qquickpopup/data/window-wheel.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
id: window
diff --git a/tests/auto/qquickpopup/data/window.qml b/tests/auto/qquickpopup/data/window.qml
index 0e15e838..f6b76b7e 100644
--- a/tests/auto/qquickpopup/data/window.qml
+++ b/tests/auto/qquickpopup/data/window.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
Window {
width: 400