aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2/wearable
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2018-10-23 15:23:58 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-02 16:45:04 +0000
commit3c7bfc156797b2f3ef08a8cf620b79da80e4b061 (patch)
tree8eb2cc945b9dab6792df6f8df59472440d998457 /examples/quickcontrols2/wearable
parent70fe6a67e8fdff5bc5486c4fe5c0e44242e10427 (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/wearable')
-rw-r--r--examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/DemoMode.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/LauncherPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/NaviButton.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Style/Slider.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Style/Switch.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Style/UIStyle.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/SwipeViewPage.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml2
-rw-r--r--examples/quickcontrols2/wearable/wearable.qml2
19 files changed, 24 insertions, 24 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
index 99343d24..6874008f 100644
--- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/DemoMode.qml b/examples/quickcontrols2/wearable/qml/DemoMode.qml
index c67a56e6..9d0f4d6b 100644
--- a/examples/quickcontrols2/wearable/qml/DemoMode.qml
+++ b/examples/quickcontrols2/wearable/qml/DemoMode.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
import "Style"
diff --git a/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml b/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml
index 66ced325..88678b36 100644
--- a/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml
+++ b/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import "Style"
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
index 1f018e2e..0e361066 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
index 53c9e5a4..96a2d975 100644
--- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml
+++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import "Style"
diff --git a/examples/quickcontrols2/wearable/qml/NaviButton.qml b/examples/quickcontrols2/wearable/qml/NaviButton.qml
index 5058bd62..55ccc19d 100644
--- a/examples/quickcontrols2/wearable/qml/NaviButton.qml
+++ b/examples/quickcontrols2/wearable/qml/NaviButton.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import "Style"
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
index 8ab82bac..4a7fbde1 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import "../Style"
import "navigation.js" as NavigationData
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
index 937b84a8..005ae3f7 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
+++ b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import "../Style"
Rectangle {
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
index eeddf6dc..b3102771 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import "../Style"
import "notifications.js" as NotificationData
diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
index bb347e7d..23bb9acd 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
index 81d4c9ef..68485f5d 100644
--- a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick 2.12
+import QtQuick.Templates 2.12 as T
import "."
T.PageIndicator {
diff --git a/examples/quickcontrols2/wearable/qml/Style/Slider.qml b/examples/quickcontrols2/wearable/qml/Style/Slider.qml
index cdff4aec..a0be11c7 100644
--- a/examples/quickcontrols2/wearable/qml/Style/Slider.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/Slider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick 2.12
+import QtQuick.Templates 2.12 as T
import "."
T.Slider {
diff --git a/examples/quickcontrols2/wearable/qml/Style/Switch.qml b/examples/quickcontrols2/wearable/qml/Style/Switch.qml
index b1597737..4a0f4e49 100644
--- a/examples/quickcontrols2/wearable/qml/Style/Switch.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/Switch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Templates 2.3 as T
+import QtQuick 2.12
+import QtQuick.Templates 2.12 as T
import "."
T.Switch {
diff --git a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml
index f4a5df69..0efe84e5 100644
--- a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
pragma Singleton
diff --git a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml b/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml
index 6d4b687f..1417d9f7 100644
--- a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml
+++ b/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Item {
// Don't show the item when the StackView that contains us
diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
index 256e60a4..2d411302 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
index 158f3d70..613d936b 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
index 1456072f..8def8b45 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import "../Style"
diff --git a/examples/quickcontrols2/wearable/wearable.qml b/examples/quickcontrols2/wearable/wearable.qml
index ea84adca..bda7d169 100644
--- a/examples/quickcontrols2/wearable/wearable.qml
+++ b/examples/quickcontrols2/wearable/wearable.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtQuick.Controls 2.3 as QQC2
import Qt.labs.settings 1.0
import "qml"