aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickdrawer
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qquickdrawer')
-rw-r--r--tests/auto/qquickdrawer/CMakeLists.txt1
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow-button.qml4
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow-hover.qml4
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow-wheel.qml4
-rw-r--r--tests/auto/qquickdrawer/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickdrawer/data/dragOverModalShadow.qml4
-rw-r--r--tests/auto/qquickdrawer/data/flickable.qml4
-rw-r--r--tests/auto/qquickdrawer/data/grabber.qml4
-rw-r--r--tests/auto/qquickdrawer/data/header.qml4
-rw-r--r--tests/auto/qquickdrawer/data/multiTouch.qml4
-rw-r--r--tests/auto/qquickdrawer/data/multiple.qml4
-rw-r--r--tests/auto/qquickdrawer/data/reposition.qml4
-rw-r--r--tests/auto/qquickdrawer/data/slider.qml4
-rw-r--r--tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml4
-rw-r--r--tests/auto/qquickdrawer/data/window-button.qml6
-rw-r--r--tests/auto/qquickdrawer/data/window-hover.qml6
-rw-r--r--tests/auto/qquickdrawer/data/window-wheel.qml6
-rw-r--r--tests/auto/qquickdrawer/data/window.qml6
18 files changed, 39 insertions, 38 deletions
diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/qquickdrawer/CMakeLists.txt
index 3679471a..e428a86c 100644
--- a/tests/auto/qquickdrawer/CMakeLists.txt
+++ b/tests/auto/qquickdrawer/CMakeLists.txt
@@ -24,6 +24,7 @@ qt_add_test(tst_qquickdrawer
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickControls2
+ Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
Qt::TestPrivate
diff --git a/tests/auto/qquickdrawer/data/applicationwindow-button.qml b/tests/auto/qquickdrawer/data/applicationwindow-button.qml
index 8e1047b5..a7c70e04 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-button.qml
+++ b/tests/auto/qquickdrawer/data/applicationwindow-button.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/qquickdrawer/data/applicationwindow-hover.qml b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml
index 3de06805..8b8efb48 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml
+++ b/tests/auto/qquickdrawer/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/qquickdrawer/data/applicationwindow-wheel.qml b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml
index 5042f44f..449fbadb 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml
+++ b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/applicationwindow.qml b/tests/auto/qquickdrawer/data/applicationwindow.qml
index 01b8ff77..3f2ed118 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow.qml
+++ b/tests/auto/qquickdrawer/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/qquickdrawer/data/dragOverModalShadow.qml b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml
index 7354b6b9..6d2951f7 100644
--- a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml
+++ b/tests/auto/qquickdrawer/data/dragOverModalShadow.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/qquickdrawer/data/flickable.qml b/tests/auto/qquickdrawer/data/flickable.qml
index 09d43029..b3f98d9e 100644
--- a/tests/auto/qquickdrawer/data/flickable.qml
+++ b/tests/auto/qquickdrawer/data/flickable.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/qquickdrawer/data/grabber.qml b/tests/auto/qquickdrawer/data/grabber.qml
index 1f9bbcbb..bd1b84aa 100644
--- a/tests/auto/qquickdrawer/data/grabber.qml
+++ b/tests/auto/qquickdrawer/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/qquickdrawer/data/header.qml b/tests/auto/qquickdrawer/data/header.qml
index af84cf9b..dfd64ab1 100644
--- a/tests/auto/qquickdrawer/data/header.qml
+++ b/tests/auto/qquickdrawer/data/header.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/qquickdrawer/data/multiTouch.qml b/tests/auto/qquickdrawer/data/multiTouch.qml
index 57135e5f..03b69c4e 100644
--- a/tests/auto/qquickdrawer/data/multiTouch.qml
+++ b/tests/auto/qquickdrawer/data/multiTouch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/multiple.qml b/tests/auto/qquickdrawer/data/multiple.qml
index d629e3d0..d4d5fbd6 100644
--- a/tests/auto/qquickdrawer/data/multiple.qml
+++ b/tests/auto/qquickdrawer/data/multiple.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/qquickdrawer/data/reposition.qml b/tests/auto/qquickdrawer/data/reposition.qml
index 841e0b77..e3211fab 100644
--- a/tests/auto/qquickdrawer/data/reposition.qml
+++ b/tests/auto/qquickdrawer/data/reposition.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/slider.qml b/tests/auto/qquickdrawer/data/slider.qml
index 391a79f0..b3db5a7b 100644
--- a/tests/auto/qquickdrawer/data/slider.qml
+++ b/tests/auto/qquickdrawer/data/slider.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/qquickdrawer/data/topEdgeScreenEdge.qml b/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml
index 02b5a10f..d2aaf486 100644
--- a/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml
+++ b/tests/auto/qquickdrawer/data/topEdgeScreenEdge.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtQuick.Controls 2.5
+import QtQuick
+import QtQuick.Controls
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/window-button.qml b/tests/auto/qquickdrawer/data/window-button.qml
index 975d50db..02247dd0 100644
--- a/tests/auto/qquickdrawer/data/window-button.qml
+++ b/tests/auto/qquickdrawer/data/window-button.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/qquickdrawer/data/window-hover.qml b/tests/auto/qquickdrawer/data/window-hover.qml
index 8360d7ce..e0b016cc 100644
--- a/tests/auto/qquickdrawer/data/window-hover.qml
+++ b/tests/auto/qquickdrawer/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/qquickdrawer/data/window-wheel.qml b/tests/auto/qquickdrawer/data/window-wheel.qml
index f313f368..e9c2eb42 100644
--- a/tests/auto/qquickdrawer/data/window-wheel.qml
+++ b/tests/auto/qquickdrawer/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/qquickdrawer/data/window.qml b/tests/auto/qquickdrawer/data/window.qml
index 578d3e9f..4bd9c9d2 100644
--- a/tests/auto/qquickdrawer/data/window.qml
+++ b/tests/auto/qquickdrawer/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