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 /src/imports/calendar | |
| 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 'src/imports/calendar')
10 files changed, 14 insertions, 14 deletions
diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index 23e3c30e..2fc0d6f7 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.11 +import QtQuick 2.12 import Qt.labs.calendar 1.0 AbstractDayOfWeekRow { diff --git a/src/imports/calendar/MonthGrid.qml b/src/imports/calendar/MonthGrid.qml index 95e2a801..884ce65f 100644 --- a/src/imports/calendar/MonthGrid.qml +++ b/src/imports/calendar/MonthGrid.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.11 +import QtQuick 2.12 import Qt.labs.calendar 1.0 AbstractMonthGrid { diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index c46e25ae..e2c9d98b 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.11 +import QtQuick 2.12 import Qt.labs.calendar 1.0 AbstractWeekNumberColumn { diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml index 0a7f1688..6f6e8f2e 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 //! [1] ListView { diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml index d7e56384..2de76098 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml index c98372b4..e52ebb2d 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml index fed2cc5a..5710b4dd 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml index 4427d343..cdb7201e 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml index a8e5717b..18613f12 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml index 1d42c1c3..f086468b 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 //! [1] |