ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-uitk1.3 into lp:ubuntu-clock-app.

Commit message:
* Update to the new SDK Ubuntu Components 1.3

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)
Related bugs:
  Bug #1508363 in Ubuntu Clock App: "Coordinated migration to UITK 1.3"
  https://bugs.launchpad.net/ubuntu-clock-app/+bug/1508363

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-uitk1.3/+merge/276650

* Update to the new SDK Ubuntu Components 1.3
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-uitk1.3 into lp:ubuntu-clock-app.

=== modified file 'app/MainPage.qml'
--- app/MainPage.qml	2015-10-06 22:02:45 +0000
+++ app/MainPage.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import QtSystemInfo 5.0
 import Qt.labs.settings 1.0
 import "upstreamcomponents"

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2015-10-16 07:38:33 +0000
+++ app/alarm/AlarmDelegate.qml	2015-11-04 13:28:43 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListItem {
     id: root

=== modified file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml	2015-08-13 13:29:49 +0000
+++ app/alarm/AlarmLabel.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Page {
     id: _alarmLabelPage

=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml	2015-08-25 11:26:57 +0000
+++ app/alarm/AlarmList.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 UbuntuListView {
     id: alarmListView

=== modified file 'app/alarm/AlarmModelComponent.qml'
--- app/alarm/AlarmModelComponent.qml	2015-08-14 05:34:49 +0000
+++ app/alarm/AlarmModelComponent.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 AlarmModel {
     id: alarmModel

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2015-10-08 21:49:48 +0000
+++ app/alarm/AlarmPage.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Page {
     id: alarmPage

=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml	2015-08-13 13:29:49 +0000
+++ app/alarm/AlarmRepeat.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Page {
     id: _alarmRepeatPage

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2015-10-06 21:22:34 +0000
+++ app/alarm/AlarmSettingsPage.qml	2015-11-04 13:28:43 +0000
@@ -20,7 +20,7 @@
 import QtQuick.Layouts 1.1
 import WorldClock 1.0
 import Alarm 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 Page {

=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	2015-08-28 20:06:32 +0000
+++ app/alarm/AlarmSound.qml	2015-11-04 13:28:43 +0000
@@ -20,7 +20,7 @@
 import Alarm 1.0
 import QtMultimedia 5.0
 import Ubuntu.Content 1.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
 import Qt.labs.folderlistmodel 2.1
 

=== modified file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml	2015-10-08 21:49:48 +0000
+++ app/alarm/AlarmUtils.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*
   Qt Object containing a collection of useful alarm functions

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2015-10-08 21:49:48 +0000
+++ app/alarm/EditAlarmPage.qml	2015-11-04 13:28:43 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import WorldClock 1.0
 import Alarm 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Pickers 1.0
 import "../components"
 

=== modified file 'app/alarm/SoundPeerPicker.qml'
--- app/alarm/SoundPeerPicker.qml	2015-08-21 13:36:56 +0000
+++ app/alarm/SoundPeerPicker.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Content 1.1
 
 Page {

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2015-10-06 22:34:27 +0000
+++ app/clock/ClockPage.qml	2015-11-04 13:28:43 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import U1db 1.0 as U1db
 import QtPositioning 5.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import WorldClock 1.0
 import "../components"
 import "../worldclock"

=== modified file 'app/clock/MainClock.qml'
--- app/clock/MainClock.qml	2015-05-27 16:03:23 +0000
+++ app/clock/MainClock.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 Clock {

=== modified file 'app/components/ActionIcon.qml'
--- app/components/ActionIcon.qml	2015-08-20 15:46:48 +0000
+++ app/components/ActionIcon.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: abstractButton

=== modified file 'app/components/AnalogMode.qml'
--- app/components/AnalogMode.qml	2015-10-06 22:34:27 +0000
+++ app/components/AnalogMode.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ClockCircle {
     id: _innerCircleAnalog

=== modified file 'app/components/AnalogShadow.qml'
--- app/components/AnalogShadow.qml	2015-08-14 05:34:49 +0000
+++ app/components/AnalogShadow.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Flipable {
     id: analogShadow

=== modified file 'app/components/Background.qml'
--- app/components/Background.qml	2015-08-14 05:34:49 +0000
+++ app/components/Background.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*
   Component to set the background of the app

=== modified file 'app/components/Clock.qml'
--- app/components/Clock.qml	2015-10-06 22:34:27 +0000
+++ app/components/Clock.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*
  Generic clock component which has a digital and analog mode. A flip animation

=== modified file 'app/components/ClockCircle.qml'
--- app/components/ClockCircle.qml	2015-08-14 05:34:49 +0000
+++ app/components/ClockCircle.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import QtGraphicalEffects 1.0
 
 /*

=== modified file 'app/components/DigitalMode.qml'
--- app/components/DigitalMode.qml	2015-09-16 15:13:36 +0000
+++ app/components/DigitalMode.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ClockCircle {
     id: _innerCircle

=== modified file 'app/components/DigitalShadow.qml'
--- app/components/DigitalShadow.qml	2015-08-14 05:34:49 +0000
+++ app/components/DigitalShadow.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Flipable {
     id: digitalShadow

=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml	2015-08-14 05:34:49 +0000
+++ app/components/EmptyState.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*
  Component which displays an empty state (approved by design). It offers an

=== modified file 'app/components/ExpandableListItem.qml'
--- app/components/ExpandableListItem.qml	2015-06-03 16:05:03 +0000
+++ app/components/ExpandableListItem.qml	2015-11-04 13:28:43 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 /*
  Component which extends the SDK Expandable list item and provides a easy

=== modified file 'app/components/HeaderNavigation.qml'
--- app/components/HeaderNavigation.qml	2015-09-11 13:13:17 +0000
+++ app/components/HeaderNavigation.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: headerRow

=== modified file 'app/components/Shadow.qml'
--- app/components/Shadow.qml	2015-08-14 05:34:49 +0000
+++ app/components/Shadow.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: _shadowContainer

=== modified file 'app/components/SubtitledListItem.qml'
--- app/components/SubtitledListItem.qml	2015-08-14 05:34:49 +0000
+++ app/components/SubtitledListItem.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*
   This component is almost an identical copy of the SDK's subtitled with the

=== modified file 'app/stopwatch/LapListView.qml'
--- app/stopwatch/LapListView.qml	2015-09-09 20:26:22 +0000
+++ app/stopwatch/LapListView.qml	2015-11-04 13:28:43 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Stopwatch 1.0
 
 ListView {

=== modified file 'app/stopwatch/StopwatchFace.qml'
--- app/stopwatch/StopwatchFace.qml	2015-08-26 22:41:34 +0000
+++ app/stopwatch/StopwatchFace.qml	2015-11-04 13:28:43 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import Stopwatch 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 ClockCircle {

=== modified file 'app/stopwatch/StopwatchPage.qml'
--- app/stopwatch/StopwatchPage.qml	2015-09-11 12:08:23 +0000
+++ app/stopwatch/StopwatchPage.qml	2015-11-04 13:28:43 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import Stopwatch 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: _stopwatchPage

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2015-10-11 20:10:27 +0000
+++ app/ubuntu-clock-app.qml	2015-11-04 13:28:43 +0000
@@ -20,7 +20,7 @@
 import WorldClock 1.0
 import U1db 1.0 as U1db
 import Alarm 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "components"
 
 MainView {

=== modified file 'app/upstreamcomponents/FakeHeader.qml'
--- app/upstreamcomponents/FakeHeader.qml	2015-08-14 05:34:49 +0000
+++ app/upstreamcomponents/FakeHeader.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Column {
     id: fakeHeader

=== modified file 'app/upstreamcomponents/FastScroll.qml'
--- app/upstreamcomponents/FastScroll.qml	2015-08-24 09:56:38 +0000
+++ app/upstreamcomponents/FastScroll.qml	2015-11-04 13:28:43 +0000
@@ -41,7 +41,7 @@
 
 // FastScroll.qml
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "FastScroll.js" as Sections
 
 Item {

=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml	2015-05-27 16:03:23 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml	2015-11-04 13:28:43 +0000
@@ -63,7 +63,7 @@
 */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Page {
     id: page
@@ -175,7 +175,7 @@
         z: 1
         width: tipLabel.paintedWidth + units.gu(6)
         height: bottomEdge.tipHeight + units.gu(1)
-        color: Theme.palette.normal.overlay
+        backgroundColor: Theme.palette.normal.overlay
         Label {
             id: tipLabel
 

=== modified file 'app/worldclock/AddWorldCityButton.qml'
--- app/worldclock/AddWorldCityButton.qml	2015-08-20 15:41:34 +0000
+++ app/worldclock/AddWorldCityButton.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 AbstractButton {

=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml	2015-10-08 19:56:37 +0000
+++ app/worldclock/UserWorldCityDelegate.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 
 ListItem {

=== modified file 'app/worldclock/UserWorldCityList.qml'
--- app/worldclock/UserWorldCityList.qml	2015-08-29 01:45:19 +0000
+++ app/worldclock/UserWorldCityList.qml	2015-11-04 13:28:43 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import WorldClock 1.0
 import U1db 1.0 as U1db
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 ListView {
     id: worldCityColumn

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2015-09-17 05:36:41 +0000
+++ app/worldclock/WorldCityList.qml	2015-11-04 13:28:43 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import WorldClock 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../components"
 import "../upstreamcomponents"
 

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-09-03 21:07:54 +0000
+++ manifest.json.in	2015-11-04 13:28:43 +0000
@@ -1,7 +1,7 @@
 {
     "name": "com.ubuntu.clock",
     "description": "A sophisticated clock app for Ubuntu Touch",
-    "framework": "ubuntu-sdk-15.04",
+    "framework": "ubuntu-sdk-15.04.1-qml",
     "architecture": "@CLICK_ARCH@",
     "title": "Clock",
     "icon": "clock@xxxxxx",

=== modified file 'tests/unit/MockClockApp.qml'
--- tests/unit/MockClockApp.qml	2015-10-06 22:34:27 +0000
+++ tests/unit/MockClockApp.qml	2015-11-04 13:28:43 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import WorldClock 1.0
 import U1db 1.0 as U1db
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../app"
 import "../../app/components"
 import "../../app/clock"

=== modified file 'tests/unit/tst_alarm.qml'
--- tests/unit/tst_alarm.qml	2015-09-17 06:28:20 +0000
+++ tests/unit/tst_alarm.qml	2015-11-04 13:28:43 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import WorldClock 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../app/alarm"
 
 MainView {

=== modified file 'tests/unit/tst_alarmLabel.qml'
--- tests/unit/tst_alarmLabel.qml	2015-08-12 16:57:29 +0000
+++ tests/unit/tst_alarmLabel.qml	2015-11-04 13:28:43 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../app/alarm"
 
 MainView {

=== modified file 'tests/unit/tst_alarmRepeat.qml'
--- tests/unit/tst_alarmRepeat.qml	2015-08-12 18:50:48 +0000
+++ tests/unit/tst_alarmRepeat.qml	2015-11-04 13:28:43 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../app/alarm"
 
 MainView {

=== modified file 'tests/unit/tst_alarmSound.qml'
--- tests/unit/tst_alarmSound.qml	2015-08-28 18:50:21 +0000
+++ tests/unit/tst_alarmSound.qml	2015-11-04 13:28:43 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Qt.labs.folderlistmodel 2.1
 import "../../app/alarm"
 

=== modified file 'tests/unit/tst_alarmUtils.qml'
--- tests/unit/tst_alarmUtils.qml	2015-10-08 20:17:11 +0000
+++ tests/unit/tst_alarmUtils.qml	2015-11-04 13:28:43 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtTest 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../app/alarm"
 
 TestCase {

=== modified file 'tests/unit/tst_stopwatchUtils.qml'
--- tests/unit/tst_stopwatchUtils.qml	2015-08-26 22:50:57 +0000
+++ tests/unit/tst_stopwatchUtils.qml	2015-11-04 13:28:43 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import QtTest 1.0
 import Stopwatch 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../../app/stopwatch"
 
 TestCase {

=== modified file 'tests/unit/tst_worldClock.qml'
--- tests/unit/tst_worldClock.qml	2015-08-17 13:07:38 +0000
+++ tests/unit/tst_worldClock.qml	2015-11-04 13:28:43 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 MockClockApp {
     id: clockApp