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 /examples/quickcontrols2/imagine/automotive/qml | |
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 'examples/quickcontrols2/imagine/automotive/qml')
4 files changed, 10 insertions, 10 deletions
diff --git a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml index dfd66ada..483059ae 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.12 Glow { color: glowColor diff --git a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml index e19d8665..d86b39c7 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 Button { id: button diff --git a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml index 50f816ce..088e9c16 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 // This container and the transform on the Label are // necessary to get precise bounding rect of the text for layouting reasons, diff --git a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml index 86355bb0..91e3bf7c 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 -import QtQuick.Controls.Imagine 2.3 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 import QtQuick.Window 2.0 ApplicationWindow { |