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

Proposed by Ken VanDine
Status: Merged
Approved by: Nekhelesh Ramananthan
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 Approve
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.
Revision history for this message
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
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Tested and the fix looks good.

465. By Ken VanDine

updated changelog

Revision history for this message
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
=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml 2016-03-03 00:28:40 +0000
+++ app/alarm/AlarmSound.qml 2016-03-16 17:10:51 +0000
@@ -19,7 +19,7 @@
19import QtQuick 2.419import QtQuick 2.4
20import Alarm 1.020import Alarm 1.0
21import QtMultimedia 5.021import QtMultimedia 5.0
22import Ubuntu.Content 1.122import Ubuntu.Content 1.3
23import Ubuntu.Components 1.323import Ubuntu.Components 1.3
24import Qt.labs.folderlistmodel 2.124import Qt.labs.folderlistmodel 2.1
2525
2626
=== modified file 'app/alarm/SoundPeerPicker.qml'
--- app/alarm/SoundPeerPicker.qml 2016-02-25 22:16:54 +0000
+++ app/alarm/SoundPeerPicker.qml 2016-03-16 17:10:51 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import Ubuntu.Content 1.121import Ubuntu.Content 1.3
2222
23Page {23Page {
24 id: picker24 id: picker
2525
=== modified file 'debian/changelog'
--- debian/changelog 2016-03-03 14:50:44 +0000
+++ debian/changelog 2016-03-16 17:10:51 +0000
@@ -8,6 +8,9 @@
8 start, pause and stop stopwatch states. (LP: #1490206)8 start, pause and stop stopwatch states. (LP: #1490206)
9 * Moved laps list delegate into its own file9 * Moved laps list delegate into its own file
1010
11 [Ken VanDine]
12 * Bump Ubuntu.Content import to 1.3 to fix theme issue
13
11 -- Nekhelesh <krnekhelesh@nik90-laptop> Wed, 02 Mar 2016 19:30:48 +010014 -- Nekhelesh <krnekhelesh@nik90-laptop> Wed, 02 Mar 2016 19:30:48 +0100
1215
13ubuntu-clock-app (3.7) wily; urgency=medium16ubuntu-clock-app (3.7) wily; urgency=medium

Subscribers

People subscribed via source and target branches