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/flatstyle | |
| 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/flatstyle')
6 files changed, 12 insertions, 12 deletions
diff --git a/examples/quickcontrols2/flatstyle/Flat/Button.qml b/examples/quickcontrols2/flatstyle/Flat/Button.qml index c56a9c6a..0420ddb4 100644 --- a/examples/quickcontrols2/flatstyle/Flat/Button.qml +++ b/examples/quickcontrols2/flatstyle/Flat/Button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Templates 2.1 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T import Theme 1.0 T.Button { diff --git a/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml b/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml index 332d63b8..ae819afa 100644 --- a/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml +++ b/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Templates 2.1 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T import Theme 1.0 T.CheckBox { diff --git a/examples/quickcontrols2/flatstyle/Flat/Switch.qml b/examples/quickcontrols2/flatstyle/Flat/Switch.qml index 00b38767..3eea062f 100644 --- a/examples/quickcontrols2/flatstyle/Flat/Switch.qml +++ b/examples/quickcontrols2/flatstyle/Flat/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Templates 2.1 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T import Theme 1.0 T.Switch { diff --git a/examples/quickcontrols2/flatstyle/MainForm.ui.qml b/examples/quickcontrols2/flatstyle/MainForm.ui.qml index 06b87d5e..e25158a3 100644 --- a/examples/quickcontrols2/flatstyle/MainForm.ui.qml +++ b/examples/quickcontrols2/flatstyle/MainForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 import Theme 1.0 Item { diff --git a/examples/quickcontrols2/flatstyle/flatstyle.qml b/examples/quickcontrols2/flatstyle/flatstyle.qml index f3e35876..44a29cda 100644 --- a/examples/quickcontrols2/flatstyle/flatstyle.qml +++ b/examples/quickcontrols2/flatstyle/flatstyle.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import Qt.labs.platform 1.0 import Theme 1.0 diff --git a/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml b/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml index 003e743b..9018ece5 100644 --- a/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml +++ b/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml @@ -50,7 +50,7 @@ pragma Singleton -import QtQuick 2.8 +import QtQuick 2.12 QtObject { readonly property color gray: "#b2b1b1" |