aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickdrawer
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-01-10 16:47:26 +0100
committerLiang Qi <liang.qi@qt.io>2019-01-10 16:47:26 +0100
commitefa04c2ae8427c70848477ace3d8f6e82baaab11 (patch)
treec0394c9cd5ce51961337a7a15e169074dd41632b /tests/auto/qquickdrawer
parent9c7429219d36e8eb40e1fe6e679715c89209fc40 (diff)
parent6476de0b669162cf08c11f5c8d5ad0b42419f365 (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts: .qmake.conf src/imports/controls/qtquickcontrols2plugin.cpp Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
Diffstat (limited to 'tests/auto/qquickdrawer')
-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/window-button.qml4
-rw-r--r--tests/auto/qquickdrawer/data/window-hover.qml4
-rw-r--r--tests/auto/qquickdrawer/data/window-wheel.qml4
-rw-r--r--tests/auto/qquickdrawer/data/window.qml4
16 files changed, 32 insertions, 32 deletions
diff --git a/tests/auto/qquickdrawer/data/applicationwindow-button.qml b/tests/auto/qquickdrawer/data/applicationwindow-button.qml
index 9641351e..8e1047b5 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-button.qml
+++ b/tests/auto/qquickdrawer/data/applicationwindow-button.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml
index 560efec3..3de06805 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml
+++ b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml
index 541f08aa..5042f44f 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml
+++ b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/applicationwindow.qml b/tests/auto/qquickdrawer/data/applicationwindow.qml
index 673c4d4c..01b8ff77 100644
--- a/tests/auto/qquickdrawer/data/applicationwindow.qml
+++ b/tests/auto/qquickdrawer/data/applicationwindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml
index 66eb2f4b..7354b6b9 100644
--- a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml
+++ b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/flickable.qml b/tests/auto/qquickdrawer/data/flickable.qml
index 62256afd..4afef66b 100644
--- a/tests/auto/qquickdrawer/data/flickable.qml
+++ b/tests/auto/qquickdrawer/data/flickable.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/grabber.qml b/tests/auto/qquickdrawer/data/grabber.qml
index e6ebe2da..1f9bbcbb 100644
--- a/tests/auto/qquickdrawer/data/grabber.qml
+++ b/tests/auto/qquickdrawer/data/grabber.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/header.qml b/tests/auto/qquickdrawer/data/header.qml
index de3af106..af84cf9b 100644
--- a/tests/auto/qquickdrawer/data/header.qml
+++ b/tests/auto/qquickdrawer/data/header.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/multiTouch.qml b/tests/auto/qquickdrawer/data/multiTouch.qml
index 0faf3c61..57135e5f 100644
--- a/tests/auto/qquickdrawer/data/multiTouch.qml
+++ b/tests/auto/qquickdrawer/data/multiTouch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/multiple.qml b/tests/auto/qquickdrawer/data/multiple.qml
index 4e622fca..d629e3d0 100644
--- a/tests/auto/qquickdrawer/data/multiple.qml
+++ b/tests/auto/qquickdrawer/data/multiple.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/reposition.qml b/tests/auto/qquickdrawer/data/reposition.qml
index 485da85c..841e0b77 100644
--- a/tests/auto/qquickdrawer/data/reposition.qml
+++ b/tests/auto/qquickdrawer/data/reposition.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickdrawer/data/slider.qml b/tests/auto/qquickdrawer/data/slider.qml
index 595e7091..391a79f0 100644
--- a/tests/auto/qquickdrawer/data/slider.qml
+++ b/tests/auto/qquickdrawer/data/slider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.9
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickdrawer/data/window-button.qml b/tests/auto/qquickdrawer/data/window-button.qml
index 1b8ac7d5..975d50db 100644
--- a/tests/auto/qquickdrawer/data/window-button.qml
+++ b/tests/auto/qquickdrawer/data/window-button.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
width: 400
diff --git a/tests/auto/qquickdrawer/data/window-hover.qml b/tests/auto/qquickdrawer/data/window-hover.qml
index b35bcd99..8360d7ce 100644
--- a/tests/auto/qquickdrawer/data/window-hover.qml
+++ b/tests/auto/qquickdrawer/data/window-hover.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
width: 400
diff --git a/tests/auto/qquickdrawer/data/window-wheel.qml b/tests/auto/qquickdrawer/data/window-wheel.qml
index 988a541e..f313f368 100644
--- a/tests/auto/qquickdrawer/data/window-wheel.qml
+++ b/tests/auto/qquickdrawer/data/window-wheel.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
id: window
diff --git a/tests/auto/qquickdrawer/data/window.qml b/tests/auto/qquickdrawer/data/window.qml
index 88376ac4..578d3e9f 100644
--- a/tests/auto/qquickdrawer/data/window.qml
+++ b/tests/auto/qquickdrawer/data/window.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
width: 400
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 16:09:36 +0000