aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2018-09-10 16:39:20 +0200
committerMitch Curtis <mitch.curtis@qt.io>2018-09-27 11:39:41 +0000
commit8a87193078d7a51c5a049e4698c44b0af43edbb3 (patch)
tree234b145ed59877517ae7a712ab198b1fc2b1af8a
parent63814ff909d9eeb3bf88a56a82e4fa01ef668db9 (diff)
wearable: bump import versions to 5.10
Some API we need is only available in later versions. Don't go past 5.10 for now, because the support isn't there yet. Change-Id: I6915d34ef37b47b9b07e6e4aa85c90ff2e8b59b2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
-rw-r--r--examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml8
-rw-r--r--examples/quickcontrols2/wearable/qml/LauncherPage.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/NaviButton.qml4
-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.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml4
-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.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml4
-rw-r--r--examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml4
-rw-r--r--examples/quickcontrols2/wearable/wearable.qml4
17 files changed, 33 insertions, 33 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
index 82a7716f..d86e182e 100644
--- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQC2
+import QtQuick 2.10
+import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
index a9a1cb98..d4db0ca0 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
@@ -48,14 +48,14 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQ2
+import QtQuick 2.10
+import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
import "fitness.js" as FitnessData
Item {
- QQ2.SwipeView {
+ QQC2.SwipeView {
id: svFitnessContainer
anchors.fill: parent
@@ -121,7 +121,7 @@ Item {
}
}
- QQ2.PageIndicator {
+ QQC2.PageIndicator {
count: svFitnessContainer.count
currentIndex: svFitnessContainer.currentIndex
diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
index 9d6d9ae9..95312bfe 100644
--- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml
+++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.1 as QQC2
+import QtQuick 2.10
+import QtQuick.Controls 2.3 as QQC2
import "Style"
PathView {
diff --git a/examples/quickcontrols2/wearable/qml/NaviButton.qml b/examples/quickcontrols2/wearable/qml/NaviButton.qml
index 7a8f7c14..5058bd62 100644
--- a/examples/quickcontrols2/wearable/qml/NaviButton.qml
+++ b/examples/quickcontrols2/wearable/qml/NaviButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQC2
+import QtQuick 2.10
+import QtQuick.Controls 2.3 as QQC2
import "Style"
QQC2.AbstractButton {
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
index 185f7986..26169c49 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.7
+import QtQuick 2.10
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 79928012..bda5ea0f 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
+++ b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.7
+import QtQuick 2.10
import "../Style"
Rectangle {
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
index d5bec2f8..dabbf735 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQC2
+import QtQuick 2.10
+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 3ed59eb8..243020a7 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQC2
+import QtQuick 2.10
+import QtQuick.Controls 2.3 as QQC2
import Qt.labs.settings 1.0
import ".."
import "../Style"
diff --git a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
index 6a92c42f..34bd27fc 100644
--- a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Templates 2.0 as T
+import QtQuick 2.10
+import QtQuick.Templates 2.3 as T
import "."
T.PageIndicator {
diff --git a/examples/quickcontrols2/wearable/qml/Style/Slider.qml b/examples/quickcontrols2/wearable/qml/Style/Slider.qml
index 86f28abe..0f19fbca 100644
--- a/examples/quickcontrols2/wearable/qml/Style/Slider.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/Slider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Templates 2.0 as T
+import QtQuick 2.10
+import QtQuick.Templates 2.3 as T
import "."
T.Slider {
diff --git a/examples/quickcontrols2/wearable/qml/Style/Switch.qml b/examples/quickcontrols2/wearable/qml/Style/Switch.qml
index a1dad07a..54295aff 100644
--- a/examples/quickcontrols2/wearable/qml/Style/Switch.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/Switch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Templates 2.0 as T
+import QtQuick 2.10
+import QtQuick.Templates 2.3 as T
import "."
T.Switch {
diff --git a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml
index 98971233..3b130497 100644
--- a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml
+++ b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.7
+import QtQuick 2.10
pragma Singleton
diff --git a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml b/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml
index 0a9ada57..6d4b687f 100644
--- a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml
+++ b/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.1
+import QtQuick 2.10
+import QtQuick.Controls 2.2
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 a02b44ee..1405a8e7 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQC2
+import QtQuick 2.10
+import QtQuick.Controls 2.3 as QQC2
import ".."
import "../Style"
import "weather.js" as WeatherData
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
index e3da38c7..143c0343 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQC2
+import QtQuick 2.10
+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 cdf96bf2..1456072f 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQC2
+import QtQuick 2.10
+import QtQuick.Controls 2.3 as QQC2
import "../Style"
Item {
diff --git a/examples/quickcontrols2/wearable/wearable.qml b/examples/quickcontrols2/wearable/wearable.qml
index 01d52b12..6be65d1b 100644
--- a/examples/quickcontrols2/wearable/wearable.qml
+++ b/examples/quickcontrols2/wearable/wearable.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.0 as QQC2
+import QtQuick 2.10
+import QtQuick.Controls 2.3 as QQC2
import "qml"
import "qml/Style"