Ubuntu Clock App

Merge lp:~ubuntu-clock-dev/ubuntu-clock-app/1-migrate-to-15.04-framework into lp:ubuntu-clock-app

  1. 1-migrate-to-15.04-framework
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 273
Merged at revision: 300
Proposed branch: lp:~ubuntu-clock-dev/ubuntu-clock-app/1-migrate-to-15.04-framework
Merge into: lp:ubuntu-clock-app
Diff against target: 764 lines (+87/-92)
48 files modified
app/alarm/AlarmDelegate.qml (+2/-2)
app/alarm/AlarmLabel.qml (+2/-2)
app/alarm/AlarmList.qml (+2/-2)
app/alarm/AlarmModelComponent.qml (+2/-2)
app/alarm/AlarmPage.qml (+2/-2)
app/alarm/AlarmRepeat.qml (+2/-2)
app/alarm/AlarmSettingsPage.qml (+2/-2)
app/alarm/AlarmSound.qml (+2/-2)
app/alarm/AlarmUtils.qml (+2/-2)
app/alarm/EditAlarmPage.qml (+2/-2)
app/clock/ClockPage.qml (+2/-2)
app/clock/MainClock.qml (+2/-2)
app/components/AnalogMode.qml (+2/-2)
app/components/AnalogShadow.qml (+2/-2)
app/components/Background.qml (+2/-2)
app/components/Clock.qml (+2/-2)
app/components/ClockCircle.qml (+2/-2)
app/components/DigitalMode.qml (+2/-2)
app/components/DigitalShadow.qml (+2/-2)
app/components/EmptyState.qml (+2/-2)
app/components/ExpandableListItem.qml (+2/-2)
app/components/HeaderButton.qml (+2/-2)
app/components/Shadow.qml (+2/-2)
app/components/SubtitledListItem.qml (+2/-2)
app/ubuntu-clock-app.qml (+2/-3)
app/upstreamcomponents/FakeHeader.qml (+2/-2)
app/upstreamcomponents/FastScroll.qml (+2/-2)
app/upstreamcomponents/ListItemWithActions.qml (+2/-2)
app/upstreamcomponents/ListItemWithActionsCheckBox.qml (+2/-2)
app/upstreamcomponents/MultipleSelectionListView.qml (+2/-2)
app/upstreamcomponents/MultipleSelectionVisualModel.qml (+1/-1)
app/upstreamcomponents/PageWithBottomEdge.qml (+1/-1)
app/worldclock/AddWorldCityButton.qml (+2/-2)
app/worldclock/UserWorldCityDelegate.qml (+2/-2)
app/worldclock/UserWorldCityList.qml (+2/-2)
app/worldclock/WorldCityList.qml (+2/-2)
debian/changelog (+1/-0)
manifest.json.in (+1/-1)
po/com.ubuntu.clock.pot (+1/-1)
tests/unit/ClockTestCase.qml (+1/-1)
tests/unit/MockClockApp.qml (+2/-3)
tests/unit/tst_alarm.qml (+2/-3)
tests/unit/tst_alarmLabel.qml (+2/-3)
tests/unit/tst_alarmRepeat.qml (+1/-2)
tests/unit/tst_alarmSound.qml (+2/-3)
tests/unit/tst_alarmUtils.qml (+2/-2)
tests/unit/tst_worldClock.qml (+1/-1)
ubuntu-clock-app.json (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-clock-dev/ubuntu-clock-app/1-migrate-to-15.04-framework
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Needs Fixing
Review via email: mp+263885@code.launchpad.net

Commit message

Migrate to ubuntu 15.04 sdk framework and QtQuick 2.4

Description of the change

This MP implements the following,
- Migrate to the ubuntu-sdk-15.04 framework
- Migrate to QtQuick 2.4

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

#blocked

This MP is blocked until,

- Jenkins moves to Vivid since we need QtQuick 2.4 and Ubuntu.Components 1.2 which is not available in utopic.

- AP tests needs to be updated similar to what has been done here [1]. However I am unable to figure out how to fix it after trying for a few days.

[1] https://code.launchpad.net/~ahayzen/music-app/refactor-bump-framework-1504/+merge/258126
[2] Couple of qml tests failing constantly

review: Needs Fixing
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:273
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/681/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/27/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/681/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:273
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/692/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/38/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/692/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml 2015-06-14 17:15:55 +0000
+++ app/alarm/AlarmDelegate.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import "../upstreamcomponents"21import "../upstreamcomponents"
2222
23ListItemWithActions {23ListItemWithActions {
2424
=== modified file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml 2014-09-21 13:20:37 +0000
+++ app/alarm/AlarmLabel.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22Page {22Page {
23 id: _alarmLabelPage23 id: _alarmLabelPage
2424
=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml 2015-03-06 17:11:42 +0000
+++ app/alarm/AlarmList.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
22import "../components"22import "../components"
23import "../upstreamcomponents"23import "../upstreamcomponents"
2424
=== modified file 'app/alarm/AlarmModelComponent.qml'
--- app/alarm/AlarmModelComponent.qml 2014-10-10 19:58:31 +0000
+++ app/alarm/AlarmModelComponent.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22AlarmModel {22AlarmModel {
23 id: alarmModel23 id: alarmModel
2424
=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml 2015-04-14 11:57:10 +0000
+++ app/alarm/AlarmPage.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import "../components"21import "../components"
2222
23Page {23Page {
2424
=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml 2015-02-22 04:33:04 +0000
+++ app/alarm/AlarmRepeat.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23Page {23Page {
2424
=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml 2015-03-13 16:55:52 +0000
+++ app/alarm/AlarmSettingsPage.qml 2015-07-06 10:47:12 +0000
@@ -16,10 +16,10 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import DateTime 1.020import DateTime 1.0
21import Alarm.Settings 1.021import Alarm.Settings 1.0
22import Ubuntu.Components 1.122import Ubuntu.Components 1.2
23import Ubuntu.Components.ListItems 1.0 as ListItem23import Ubuntu.Components.ListItems 1.0 as ListItem
24import "../components"24import "../components"
2525
2626
=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml 2015-03-06 01:09:21 +0000
+++ app/alarm/AlarmSound.qml 2015-07-06 10:47:12 +0000
@@ -16,9 +16,9 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import QtMultimedia 5.020import QtMultimedia 5.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
22import Ubuntu.Components.ListItems 1.0 as ListItem22import Ubuntu.Components.ListItems 1.0 as ListItem
2323
24Page {24Page {
2525
=== modified file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml 2014-11-17 16:11:18 +0000
+++ app/alarm/AlarmUtils.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22/*22/*
23 Qt Object containing a collection of useful alarm functions23 Qt Object containing a collection of useful alarm functions
2424
=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml 2015-03-06 17:11:42 +0000
+++ app/alarm/EditAlarmPage.qml 2015-07-06 10:47:12 +0000
@@ -16,9 +16,9 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import DateTime 1.020import DateTime 1.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
22import Qt.labs.folderlistmodel 2.122import Qt.labs.folderlistmodel 2.1
23import Ubuntu.Components.Pickers 1.023import Ubuntu.Components.Pickers 1.0
24import Ubuntu.Components.ListItems 1.0 as ListItem24import Ubuntu.Components.ListItems 1.0 as ListItem
2525
=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml 2015-05-15 16:38:24 +0000
+++ app/clock/ClockPage.qml 2015-07-06 10:47:12 +0000
@@ -16,10 +16,10 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import U1db 1.0 as U1db20import U1db 1.0 as U1db
21import QtPositioning 5.221import QtPositioning 5.2
22import Ubuntu.Components 1.122import Ubuntu.Components 1.2
23import GeoLocation 1.023import GeoLocation 1.0
24import "../alarm"24import "../alarm"
25import "../components"25import "../components"
2626
=== modified file 'app/clock/MainClock.qml'
--- app/clock/MainClock.qml 2015-01-22 00:11:57 +0000
+++ app/clock/MainClock.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import "../components"21import "../components"
2222
23Clock {23Clock {
2424
=== modified file 'app/components/AnalogMode.qml'
--- app/components/AnalogMode.qml 2014-10-10 19:58:49 +0000
+++ app/components/AnalogMode.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22ClockCircle {22ClockCircle {
23 id: _innerCircleAnalog23 id: _innerCircleAnalog
2424
=== modified file 'app/components/AnalogShadow.qml'
--- app/components/AnalogShadow.qml 2014-09-06 15:16:43 +0000
+++ app/components/AnalogShadow.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22Flipable {22Flipable {
23 id: analogShadow23 id: analogShadow
2424
=== modified file 'app/components/Background.qml'
--- app/components/Background.qml 2014-10-10 23:00:40 +0000
+++ app/components/Background.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22/*22/*
23 Component to set the background of the app23 Component to set the background of the app
2424
=== modified file 'app/components/Clock.qml'
--- app/components/Clock.qml 2014-10-03 11:40:54 +0000
+++ app/components/Clock.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22/*22/*
23 Generic clock component which has a digital and analog mode. A flip animation23 Generic clock component which has a digital and analog mode. A flip animation
2424
=== modified file 'app/components/ClockCircle.qml'
--- app/components/ClockCircle.qml 2014-10-16 21:31:16 +0000
+++ app/components/ClockCircle.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import QtGraphicalEffects 1.021import QtGraphicalEffects 1.0
2222
23/*23/*
2424
=== modified file 'app/components/DigitalMode.qml'
--- app/components/DigitalMode.qml 2015-05-26 10:09:24 +0000
+++ app/components/DigitalMode.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22ClockCircle {22ClockCircle {
23 id: _innerCircle23 id: _innerCircle
2424
=== modified file 'app/components/DigitalShadow.qml'
--- app/components/DigitalShadow.qml 2014-09-06 15:16:43 +0000
+++ app/components/DigitalShadow.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22Flipable {22Flipable {
23 id: digitalShadow23 id: digitalShadow
2424
=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml 2015-05-26 14:38:54 +0000
+++ app/components/EmptyState.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22/*22/*
23 Component which displays an empty state (approved by design). It offers an23 Component which displays an empty state (approved by design). It offers an
2424
=== modified file 'app/components/ExpandableListItem.qml'
--- app/components/ExpandableListItem.qml 2015-03-13 18:56:45 +0000
+++ app/components/ExpandableListItem.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23/*23/*
2424
=== modified file 'app/components/HeaderButton.qml'
--- app/components/HeaderButton.qml 2014-09-17 14:35:13 +0000
+++ app/components/HeaderButton.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22AbstractButton {22AbstractButton {
23 id: headerButton23 id: headerButton
2424
=== modified file 'app/components/Shadow.qml'
--- app/components/Shadow.qml 2014-08-24 12:47:50 +0000
+++ app/components/Shadow.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22Item {22Item {
23 id: _shadowContainer23 id: _shadowContainer
2424
=== modified file 'app/components/SubtitledListItem.qml'
--- app/components/SubtitledListItem.qml 2014-10-15 20:43:45 +0000
+++ app/components/SubtitledListItem.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23/*23/*
2424
=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml 2015-01-22 00:11:57 +0000
+++ app/ubuntu-clock-app.qml 2015-07-06 10:47:12 +0000
@@ -16,10 +16,10 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import DateTime 1.020import DateTime 1.0
21import U1db 1.0 as U1db21import U1db 1.0 as U1db
22import Ubuntu.Components 1.122import Ubuntu.Components 1.2
23import "clock"23import "clock"
24import "components"24import "components"
2525
@@ -51,7 +51,6 @@
5151
52 backgroundColor: "#F5F5F5"52 backgroundColor: "#F5F5F5"
5353
54 useDeprecatedToolbar: false
55 anchorToKeyboard: true54 anchorToKeyboard: true
5655
57 Background {}56 Background {}
5857
=== modified file 'app/upstreamcomponents/FakeHeader.qml'
--- app/upstreamcomponents/FakeHeader.qml 2014-09-01 19:33:42 +0000
+++ app/upstreamcomponents/FakeHeader.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22Column {22Column {
23 id: fakeHeader23 id: fakeHeader
2424
=== modified file 'app/upstreamcomponents/FastScroll.qml'
--- app/upstreamcomponents/FastScroll.qml 2014-09-20 10:47:21 +0000
+++ app/upstreamcomponents/FastScroll.qml 2015-07-06 10:47:12 +0000
@@ -40,8 +40,8 @@
40****************************************************************************/40****************************************************************************/
4141
42// FastScroll.qml42// FastScroll.qml
43import QtQuick 2.343import QtQuick 2.4
44import Ubuntu.Components 1.144import Ubuntu.Components 1.2
45import "FastScroll.js" as Sections45import "FastScroll.js" as Sections
4646
47Item {47Item {
4848
=== modified file 'app/upstreamcomponents/ListItemWithActions.qml'
--- app/upstreamcomponents/ListItemWithActions.qml 2014-10-05 15:53:58 +0000
+++ app/upstreamcomponents/ListItemWithActions.qml 2015-07-06 10:47:12 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.2
1919
20Item {20Item {
21 id: root21 id: root
2222
=== modified file 'app/upstreamcomponents/ListItemWithActionsCheckBox.qml'
--- app/upstreamcomponents/ListItemWithActionsCheckBox.qml 2014-09-20 10:47:21 +0000
+++ app/upstreamcomponents/ListItemWithActionsCheckBox.qml 2015-07-06 10:47:12 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.2
1919
20CheckBox {20CheckBox {
21 checked: root.selected21 checked: root.selected
2222
=== modified file 'app/upstreamcomponents/MultipleSelectionListView.qml'
--- app/upstreamcomponents/MultipleSelectionListView.qml 2014-09-20 10:47:21 +0000
+++ app/upstreamcomponents/MultipleSelectionListView.qml 2015-07-06 10:47:12 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.2
19import Ubuntu.Components.Popups 1.0 as Popups19import Ubuntu.Components.Popups 1.0 as Popups
2020
21/*!21/*!
2222
=== modified file 'app/upstreamcomponents/MultipleSelectionVisualModel.qml'
--- app/upstreamcomponents/MultipleSelectionVisualModel.qml 2014-09-20 10:47:21 +0000
+++ app/upstreamcomponents/MultipleSelectionVisualModel.qml 2015-07-06 10:47:12 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.4
1818
19VisualDataModel {19VisualDataModel {
20 id: contactVisualModel20 id: contactVisualModel
2121
=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml 2014-10-10 21:03:22 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml 2015-07-06 10:47:12 +0000
@@ -63,7 +63,7 @@
63*/63*/
6464
65import QtQuick 2.265import QtQuick 2.2
66import Ubuntu.Components 1.166import Ubuntu.Components 1.2
6767
68Page {68Page {
69 id: page69 id: page
7070
=== modified file 'app/worldclock/AddWorldCityButton.qml'
--- app/worldclock/AddWorldCityButton.qml 2014-09-19 11:30:40 +0000
+++ app/worldclock/AddWorldCityButton.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import "../components"21import "../components"
2222
23AbstractButton {23AbstractButton {
2424
=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml 2015-04-06 13:33:55 +0000
+++ app/worldclock/UserWorldCityDelegate.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import "../components"21import "../components"
22import "../upstreamcomponents"22import "../upstreamcomponents"
2323
2424
=== modified file 'app/worldclock/UserWorldCityList.qml'
--- app/worldclock/UserWorldCityList.qml 2014-10-03 11:40:54 +0000
+++ app/worldclock/UserWorldCityList.qml 2015-07-06 10:47:12 +0000
@@ -16,10 +16,10 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Timezone 1.020import Timezone 1.0
21import U1db 1.0 as U1db21import U1db 1.0 as U1db
22import Ubuntu.Components 1.122import Ubuntu.Components 1.2
2323
24Column {24Column {
25 id: worldCityColumn25 id: worldCityColumn
2626
=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml 2015-06-18 18:13:54 +0000
+++ app/worldclock/WorldCityList.qml 2015-07-06 10:47:12 +0000
@@ -16,9 +16,9 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Timezone 1.020import Timezone 1.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
22import Ubuntu.Components.ListItems 1.0 as ListItem22import Ubuntu.Components.ListItems 1.0 as ListItem
23import "../components"23import "../components"
24import "../upstreamcomponents"24import "../upstreamcomponents"
2525
=== modified file 'debian/changelog'
--- debian/changelog 2015-06-19 18:40:57 +0000
+++ debian/changelog 2015-07-06 10:47:12 +0000
@@ -38,6 +38,7 @@
38 location access (LP: #1393827)38 location access (LP: #1393827)
39 * Increased date font size (LP: #1432736)39 * Increased date font size (LP: #1432736)
40 * Fixed empty state component width warnings40 * Fixed empty state component width warnings
41 * Migrated to the 15.04 framework and also QtQuick 2.4
41 * Locked clock app orientation to portrait (LP: #1465457)42 * Locked clock app orientation to portrait (LP: #1465457)
4243
43 [themeles] 44 [themeles]
4445
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-06-18 18:13:54 +0000
+++ manifest.json.in 2015-07-06 10:47:12 +0000
@@ -1,7 +1,7 @@
1{1{
2 "name": "com.ubuntu.clock",2 "name": "com.ubuntu.clock",
3 "description": "A sophisticated clock app for Ubuntu Touch",3 "description": "A sophisticated clock app for Ubuntu Touch",
4 "framework": "ubuntu-sdk-14.10",4 "framework": "ubuntu-sdk-15.04",
5 "architecture": "@CLICK_ARCH@",5 "architecture": "@CLICK_ARCH@",
6 "title": "Clock",6 "title": "Clock",
7 "icon": "clock@30.png",7 "icon": "clock@30.png",
88
=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot 2015-06-18 18:13:54 +0000
+++ po/com.ubuntu.clock.pot 2015-07-06 10:47:12 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-06-18 18:12+0000\n"11"POT-Creation-Date: 2015-06-18 22:57+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
1515
=== modified file 'tests/unit/ClockTestCase.qml'
--- tests/unit/ClockTestCase.qml 2014-10-14 16:01:30 +0000
+++ tests/unit/ClockTestCase.qml 2015-07-06 10:47:12 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtTest 1.019import QtTest 1.0
20import QtQuick 2.320import QtQuick 2.4
21import Ubuntu.Test 1.021import Ubuntu.Test 1.0
2222
23/*23/*
2424
=== modified file 'tests/unit/MockClockApp.qml'
--- tests/unit/MockClockApp.qml 2014-10-28 13:19:46 +0000
+++ tests/unit/MockClockApp.qml 2015-07-06 10:47:12 +0000
@@ -16,10 +16,10 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import DateTime 1.020import DateTime 1.0
21import U1db 1.0 as U1db21import U1db 1.0 as U1db
22import Ubuntu.Components 1.122import Ubuntu.Components 1.2
23import "../../app/clock"23import "../../app/clock"
24import "../../app/components"24import "../../app/components"
2525
@@ -37,7 +37,6 @@
3737
38 width: units.gu(40)38 width: units.gu(40)
39 height: units.gu(70)39 height: units.gu(70)
40 useDeprecatedToolbar: false
41 applicationName: "com.ubuntu.fakeclock.test"40 applicationName: "com.ubuntu.fakeclock.test"
4241
43 U1db.Database {42 U1db.Database {
4443
=== modified file 'tests/unit/tst_alarm.qml'
--- tests/unit/tst_alarm.qml 2014-10-14 09:45:06 +0000
+++ tests/unit/tst_alarm.qml 2015-07-06 10:47:12 +0000
@@ -16,9 +16,9 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import DateTime 1.020import DateTime 1.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
22import "../../app/alarm"22import "../../app/alarm"
2323
24MainView {24MainView {
@@ -26,7 +26,6 @@
2626
27 width: units.gu(40)27 width: units.gu(40)
28 height: units.gu(70)28 height: units.gu(70)
29 useDeprecatedToolbar: false
3029
31 property var clockTime: new Date30 property var clockTime: new Date
32 (31 (
3332
=== modified file 'tests/unit/tst_alarmLabel.qml'
--- tests/unit/tst_alarmLabel.qml 2014-10-14 09:23:37 +0000
+++ tests/unit/tst_alarmLabel.qml 2015-07-06 10:47:12 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import "../../app/alarm"21import "../../app/alarm"
2222
23MainView {23MainView {
@@ -25,7 +25,6 @@
2525
26 width: units.gu(40)26 width: units.gu(40)
27 height: units.gu(70)27 height: units.gu(70)
28 useDeprecatedToolbar: false
2928
30 Alarm {29 Alarm {
31 id: _alarm30 id: _alarm
3231
=== modified file 'tests/unit/tst_alarmRepeat.qml'
--- tests/unit/tst_alarmRepeat.qml 2015-01-22 00:11:57 +0000
+++ tests/unit/tst_alarmRepeat.qml 2015-07-06 10:47:12 +0000
@@ -19,7 +19,7 @@
19import QtQuick 2.019import QtQuick 2.0
20import QtTest 1.020import QtTest 1.0
21import Ubuntu.Test 1.021import Ubuntu.Test 1.0
22import Ubuntu.Components 1.122import Ubuntu.Components 1.2
23import "../../app/alarm"23import "../../app/alarm"
2424
25MainView {25MainView {
@@ -27,7 +27,6 @@
2727
28 width: units.gu(40)28 width: units.gu(40)
29 height: units.gu(70)29 height: units.gu(70)
30 useDeprecatedToolbar: false
3130
32 Alarm {31 Alarm {
33 id: _alarm32 id: _alarm
3433
=== modified file 'tests/unit/tst_alarmSound.qml'
--- tests/unit/tst_alarmSound.qml 2014-09-25 20:16:40 +0000
+++ tests/unit/tst_alarmSound.qml 2015-07-06 10:47:12 +0000
@@ -16,10 +16,10 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import QtTest 1.020import QtTest 1.0
21import Ubuntu.Test 1.021import Ubuntu.Test 1.0
22import Ubuntu.Components 1.122import Ubuntu.Components 1.2
23import Qt.labs.folderlistmodel 2.123import Qt.labs.folderlistmodel 2.1
24import "../../app/alarm"24import "../../app/alarm"
2525
@@ -28,7 +28,6 @@
2828
29 width: units.gu(40)29 width: units.gu(40)
30 height: units.gu(70)30 height: units.gu(70)
31 useDeprecatedToolbar: false
3231
33 Alarm {32 Alarm {
34 id: _alarm33 id: _alarm
3534
=== modified file 'tests/unit/tst_alarmUtils.qml'
--- tests/unit/tst_alarmUtils.qml 2014-10-06 21:21:58 +0000
+++ tests/unit/tst_alarmUtils.qml 2015-07-06 10:47:12 +0000
@@ -16,9 +16,9 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import QtTest 1.020import QtTest 1.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
22import "../../app/alarm"22import "../../app/alarm"
2323
24TestCase {24TestCase {
2525
=== modified file 'tests/unit/tst_worldClock.qml'
--- tests/unit/tst_worldClock.qml 2014-10-14 11:33:23 +0000
+++ tests/unit/tst_worldClock.qml 2015-07-06 10:47:12 +0000
@@ -19,7 +19,7 @@
19import QtQuick 2.019import QtQuick 2.0
20import QtTest 1.020import QtTest 1.0
21import Ubuntu.Test 1.021import Ubuntu.Test 1.0
22import Ubuntu.Components 1.122import Ubuntu.Components 1.2
2323
24MockClockApp {24MockClockApp {
25 id: clockApp25 id: clockApp
2626
=== modified file 'ubuntu-clock-app.json'
--- ubuntu-clock-app.json 2014-08-21 19:19:36 +0000
+++ ubuntu-clock-app.json 2015-07-06 10:47:12 +0000
@@ -5,5 +5,5 @@
5 "networking",5 "networking",
6 "location"6 "location"
7 ],7 ],
8 "policy_version": 1.28 "policy_version": 1.3
9}9}
10\ No newline at end of file10\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: