Ubuntu Clock App

Merge lp:~ken-vandine/ubuntu-clock-app/lp1554621 into lp:ubuntu-clock-app

  1. lp1554621
  2. Merge into trunk
Proposed by Ken VanDine on 2016-03-16
Status: Merged
Approved by: Nekhelesh Ramananthan on 2016-03-16
Approved revision: 465
Merged at revision: 464
Proposed branch: lp:~ken-vandine/ubuntu-clock-app/lp1554621
Merge into: lp:ubuntu-clock-app
Diff against target: 39 lines (+5/-2)
3 files modified
app/alarm/AlarmSound.qml (+1/-1)
app/alarm/SoundPeerPicker.qml (+1/-1)
debian/changelog (+3/-0)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-clock-app/lp1554621
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan 2016-03-16 Approve on 2016-03-16
Review via email: mp+289246@code.launchpad.net

Commit Message

Bump Ubuntu.Content import to 1.3 to fix theme issue

Description of the Change

Bump Ubuntu.Content import to 1.3 to fix theme issue

To post a comment you must log in.
Nekhelesh Ramananthan (nik90) wrote :

Thanks for the fix. When we migrated to UC 1.3, I did notice the issue, but wasn't aware of ContentHub 1.3 import. Could you please update debian changelog?

review: Needs Fixing
Nekhelesh Ramananthan (nik90) wrote :

Tested and the fix looks good.

lp:~ken-vandine/ubuntu-clock-app/lp1554621 updated on 2016-03-16
465. By Ken VanDine on 2016-03-16

updated changelog

Nekhelesh Ramananthan (nik90) wrote :

Awesome! Thnx again.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/alarm/AlarmSound.qml'
2--- app/alarm/AlarmSound.qml 2016-03-03 00:28:40 +0000
3+++ app/alarm/AlarmSound.qml 2016-03-16 17:10:51 +0000
4@@ -19,7 +19,7 @@
5 import QtQuick 2.4
6 import Alarm 1.0
7 import QtMultimedia 5.0
8-import Ubuntu.Content 1.1
9+import Ubuntu.Content 1.3
10 import Ubuntu.Components 1.3
11 import Qt.labs.folderlistmodel 2.1
12
13
14=== modified file 'app/alarm/SoundPeerPicker.qml'
15--- app/alarm/SoundPeerPicker.qml 2016-02-25 22:16:54 +0000
16+++ app/alarm/SoundPeerPicker.qml 2016-03-16 17:10:51 +0000
17@@ -18,7 +18,7 @@
18
19 import QtQuick 2.4
20 import Ubuntu.Components 1.3
21-import Ubuntu.Content 1.1
22+import Ubuntu.Content 1.3
23
24 Page {
25 id: picker
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2016-03-03 14:50:44 +0000
29+++ debian/changelog 2016-03-16 17:10:51 +0000
30@@ -8,6 +8,9 @@
31 start, pause and stop stopwatch states. (LP: #1490206)
32 * Moved laps list delegate into its own file
33
34+ [Ken VanDine]
35+ * Bump Ubuntu.Content import to 1.3 to fix theme issue
36+
37 -- Nekhelesh <krnekhelesh@nik90-laptop> Wed, 02 Mar 2016 19:30:48 +0100
38
39 ubuntu-clock-app (3.7) wily; urgency=medium

Subscribers

People subscribed via source and target branches