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/contactlist | |
| 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/contactlist')
7 files changed, 15 insertions, 15 deletions
diff --git a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml b/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml index c3047dcb..36803599 100644 --- a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml +++ b/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 ItemDelegate { id: delegate diff --git a/examples/quickcontrols2/contactlist/ContactDialog.qml b/examples/quickcontrols2/contactlist/ContactDialog.qml index 3fa0af40..7569f356 100644 --- a/examples/quickcontrols2/contactlist/ContactDialog.qml +++ b/examples/quickcontrols2/contactlist/ContactDialog.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Dialog { id: dialog diff --git a/examples/quickcontrols2/contactlist/ContactForm.ui.qml b/examples/quickcontrols2/contactlist/ContactForm.ui.qml index 831d3fcd..5988735a 100644 --- a/examples/quickcontrols2/contactlist/ContactForm.ui.qml +++ b/examples/quickcontrols2/contactlist/ContactForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 GridLayout { id: grid diff --git a/examples/quickcontrols2/contactlist/ContactView.ui.qml b/examples/quickcontrols2/contactlist/ContactView.ui.qml index ef47f551..747f3042 100644 --- a/examples/quickcontrols2/contactlist/ContactView.ui.qml +++ b/examples/quickcontrols2/contactlist/ContactView.ui.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import Backend 1.0 ListView { diff --git a/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml b/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml index 884daf03..e7d7c2aa 100644 --- a/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml +++ b/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ToolBar { id: background diff --git a/examples/quickcontrols2/contactlist/contactlist.qml b/examples/quickcontrols2/contactlist/contactlist.qml index edddfc02..f79c609b 100644 --- a/examples/quickcontrols2/contactlist/contactlist.qml +++ b/examples/quickcontrols2/contactlist/contactlist.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml b/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml index c25789fa..12c1d416 100644 --- a/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml +++ b/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 ListModel { ListElement { |