aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickmenu
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/qquickmenu
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/qquickmenu')
-rw-r--r--tests/auto/qquickmenu/data/actions.qml4
-rw-r--r--tests/auto/qquickmenu/data/addItem.qml4
-rw-r--r--tests/auto/qquickmenu/data/applicationWindowScrollable.qml4
-rw-r--r--tests/auto/qquickmenu/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml4
-rw-r--r--tests/auto/qquickmenu/data/disableWhenTriggered.qml4
-rw-r--r--tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml4
-rw-r--r--tests/auto/qquickmenu/data/menuItemWidths.qml4
-rw-r--r--tests/auto/qquickmenu/data/menuSeparator.qml4
-rw-r--r--tests/auto/qquickmenu/data/mnemonics.qml4
-rw-r--r--tests/auto/qquickmenu/data/order.qml4
-rw-r--r--tests/auto/qquickmenu/data/popup.qml4
-rw-r--r--tests/auto/qquickmenu/data/pressAndHold.qml4
-rw-r--r--tests/auto/qquickmenu/data/removeTakeItem.qml4
-rw-r--r--tests/auto/qquickmenu/data/repeater.qml4
-rw-r--r--tests/auto/qquickmenu/data/scrollableWithPadding.qml6
-rw-r--r--tests/auto/qquickmenu/data/subMenuDisabled.qml4
-rw-r--r--tests/auto/qquickmenu/data/subMenus.qml4
-rw-r--r--tests/auto/qquickmenu/data/windowScrollable.qml6
19 files changed, 40 insertions, 40 deletions
diff --git a/tests/auto/qquickmenu/data/actions.qml b/tests/auto/qquickmenu/data/actions.qml
index 6998c722..226c9450 100644
--- a/tests/auto/qquickmenu/data/actions.qml
+++ b/tests/auto/qquickmenu/data/actions.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/qquickmenu/data/addItem.qml b/tests/auto/qquickmenu/data/addItem.qml
index ae592432..b9d38afd 100644
--- a/tests/auto/qquickmenu/data/addItem.qml
+++ b/tests/auto/qquickmenu/data/addItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml
index b9894aed..22ab278e 100644
--- a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml
+++ b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
title: "Test Application Window"
diff --git a/tests/auto/qquickmenu/data/applicationwindow.qml b/tests/auto/qquickmenu/data/applicationwindow.qml
index 13f14d2d..d15c0a88 100644
--- a/tests/auto/qquickmenu/data/applicationwindow.qml
+++ b/tests/auto/qquickmenu/data/applicationwindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
title: "Test Application Window"
diff --git a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml
index 303e9155..b2af27e9 100644
--- a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml
+++ b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 800
diff --git a/tests/auto/qquickmenu/data/disableWhenTriggered.qml b/tests/auto/qquickmenu/data/disableWhenTriggered.qml
index c64916ae..9de8868f 100644
--- a/tests/auto/qquickmenu/data/disableWhenTriggered.qml
+++ b/tests/auto/qquickmenu/data/disableWhenTriggered.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml b/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml
index a39c5f44..496544e9 100644
--- a/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml
+++ b/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/menuItemWidths.qml b/tests/auto/qquickmenu/data/menuItemWidths.qml
index 6d2baa32..e956a29f 100644
--- a/tests/auto/qquickmenu/data/menuItemWidths.qml
+++ b/tests/auto/qquickmenu/data/menuItemWidths.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 600
diff --git a/tests/auto/qquickmenu/data/menuSeparator.qml b/tests/auto/qquickmenu/data/menuSeparator.qml
index ce6bd307..d71d99c5 100644
--- a/tests/auto/qquickmenu/data/menuSeparator.qml
+++ b/tests/auto/qquickmenu/data/menuSeparator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/mnemonics.qml b/tests/auto/qquickmenu/data/mnemonics.qml
index 510d2401..6525e59e 100644
--- a/tests/auto/qquickmenu/data/mnemonics.qml
+++ b/tests/auto/qquickmenu/data/mnemonics.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/qquickmenu/data/order.qml b/tests/auto/qquickmenu/data/order.qml
index e03c86d3..f2f18168 100644
--- a/tests/auto/qquickmenu/data/order.qml
+++ b/tests/auto/qquickmenu/data/order.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/popup.qml b/tests/auto/qquickmenu/data/popup.qml
index 3272cd6f..88c08b46 100644
--- a/tests/auto/qquickmenu/data/popup.qml
+++ b/tests/auto/qquickmenu/data/popup.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/qquickmenu/data/pressAndHold.qml b/tests/auto/qquickmenu/data/pressAndHold.qml
index bcc46c08..a16a15da 100644
--- a/tests/auto/qquickmenu/data/pressAndHold.qml
+++ b/tests/auto/qquickmenu/data/pressAndHold.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/qquickmenu/data/removeTakeItem.qml b/tests/auto/qquickmenu/data/removeTakeItem.qml
index 7e930812..cfe7585e 100644
--- a/tests/auto/qquickmenu/data/removeTakeItem.qml
+++ b/tests/auto/qquickmenu/data/removeTakeItem.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/repeater.qml b/tests/auto/qquickmenu/data/repeater.qml
index 40f44281..50c8adcb 100644
--- a/tests/auto/qquickmenu/data/repeater.qml
+++ b/tests/auto/qquickmenu/data/repeater.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickmenu/data/scrollableWithPadding.qml b/tests/auto/qquickmenu/data/scrollableWithPadding.qml
index 86405ccb..c8e73858 100644
--- a/tests/auto/qquickmenu/data/scrollableWithPadding.qml
+++ b/tests/auto/qquickmenu/data/scrollableWithPadding.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Window 2.11
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Window
Window {
title: "Test Window"
diff --git a/tests/auto/qquickmenu/data/subMenuDisabled.qml b/tests/auto/qquickmenu/data/subMenuDisabled.qml
index 36ca1103..e50ab7ab 100644
--- a/tests/auto/qquickmenu/data/subMenuDisabled.qml
+++ b/tests/auto/qquickmenu/data/subMenuDisabled.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 600
diff --git a/tests/auto/qquickmenu/data/subMenus.qml b/tests/auto/qquickmenu/data/subMenus.qml
index 4952e7a1..fad59ee6 100644
--- a/tests/auto/qquickmenu/data/subMenus.qml
+++ b/tests/auto/qquickmenu/data/subMenus.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
width: 600
diff --git a/tests/auto/qquickmenu/data/windowScrollable.qml b/tests/auto/qquickmenu/data/windowScrollable.qml
index 0d495242..7c3a5234 100644
--- a/tests/auto/qquickmenu/data/windowScrollable.qml
+++ b/tests/auto/qquickmenu/data/windowScrollable.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Window 2.11
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Window
Window {
title: "Test Window"