diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2018-10-23 15:23:58 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-11-02 16:45:04 +0000 |
commit | 3c7bfc156797b2f3ef08a8cf620b79da80e4b061 (patch) | |
tree | 8eb2cc945b9dab6792df6f8df59472440d998457 /tests/auto/qquickdrawer | |
parent | 70fe6a67e8fdff5bc5486c4fe5c0e44242e10427 (diff) |
Tie minor version of all imports to Qt's minor version
This change makes all Qt Quick Controls 2 imports match the current
Qt minor version, which is 12 as of this patch.
It also updates all other Qt Quick imports to match.
This will also make future version bumps easier as all version numbers
in existing code/docs will match.
The following commands were used to verify that no old versions remain:
for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done
for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done
[ChangeLog] From Qt 5.12 onwards, all import versions in
Qt Quick Controls 2 follow the same minor version as Qt's
minor version number. For example, the import version for Qt 5.12 is:
"import QtQuick.Controls 2.12".
Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3
Fixes: QTBUG-71095
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/qquickdrawer')
-rw-r--r-- | tests/auto/qquickdrawer/data/applicationwindow-button.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/applicationwindow-hover.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/applicationwindow-wheel.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/applicationwindow.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/dragOverModalShadow.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/flickable.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/grabber.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/header.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/multiTouch.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/multiple.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/reposition.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/slider.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/window-button.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/window-hover.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/window-wheel.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/window.qml | 4 |
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 |