diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-03-13 10:03:37 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-13 10:19:25 +0000 |
| commit | 2f8e91e37d327c8dacd5c137e4198f274898f72a (patch) | |
| tree | eccf489ba2a99711a8ed685d85c71fcac856d8ea /examples/quickcontrols2/wearable/qml | |
| parent | 809df2c258914c7490c005fb192a0861eaace658 (diff) | |
Wearable: rename WatchFace to WorldClock
To be consistent how the pages/apps are called in the UI vs. code.
Change-Id: I721d3ebb8631aa97a1ab43e6924cd0e4d0f39d24
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'examples/quickcontrols2/wearable/qml')
| -rw-r--r-- | examples/quickcontrols2/wearable/qml/LauncherPage.qml | 4 | ||||
| -rw-r--r-- | examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml (renamed from examples/quickcontrols2/wearable/qml/WatchFace/Clock.qml) | 2 | ||||
| -rw-r--r-- | examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml (renamed from examples/quickcontrols2/wearable/qml/WatchFace/WatchFacePage.qml) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml index b1f642ee..9c82393f 100644 --- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml +++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml @@ -69,8 +69,8 @@ PathView { model: ListModel { ListElement { title: qsTr("World Clock") - icon: "../images/watchface/watch.png" - page: "WatchFace/WatchFacePage.qml" + icon: "../images/worldclock/watch.png" + page: "WorldClock/WorldClockPage.qml" } ListElement { title: qsTr("Navigation") diff --git a/examples/quickcontrols2/wearable/qml/WatchFace/Clock.qml b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml index 545c1b6e..7e30a371 100644 --- a/examples/quickcontrols2/wearable/qml/WatchFace/Clock.qml +++ b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml @@ -65,7 +65,7 @@ Item { property bool internationalTime: true //Unset for local time function getWatchFaceImage(imageName) { - return "../../images/watchface/" + imageName + return "../../images/worldclock/" + imageName } function timeChanged() { diff --git a/examples/quickcontrols2/wearable/qml/WatchFace/WatchFacePage.qml b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml index 33e6dcfb..33e6dcfb 100644 --- a/examples/quickcontrols2/wearable/qml/WatchFace/WatchFacePage.qml +++ b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml |