Merge lp:~vthompson/music-app/fix-deprecated-properties into lp:music-app

Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 922
Merged at revision: 922
Proposed branch: lp:~vthompson/music-app/fix-deprecated-properties
Merge into: lp:music-app
Diff against target: 45 lines (+7/-3)
3 files modified
app/components/Themes/Ambiance/BubbleShape.qml (+1/-1)
app/components/Walkthrough/Slide1.qml (+3/-2)
debian/changelog (+3/-0)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-deprecated-properties
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+272347@code.launchpad.net

Commit message

* Remove some deprecated code for the UbuntuShape image property.

Description of the change

* Remove some deprecated code for the UbuntuShape image property.

There are other instances related to using ListItems in UC1.2, but those will eventually be resolved as well.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:922
http://91.189.93.70:8080/job/music-app-ci/1382/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/234

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1382/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM :-)

review: Approve
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Damn my English needs sorting out...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/Themes/Ambiance/BubbleShape.qml'
2--- app/components/Themes/Ambiance/BubbleShape.qml 2015-06-20 17:49:57 +0000
3+++ app/components/Themes/Ambiance/BubbleShape.qml 2015-09-25 08:13:29 +0000
4@@ -112,7 +112,7 @@
5 anchors.fill: parent
6 borderSource: "none"
7 color: Theme.palette.normal.overlay
8- image: bubbleShape.clipContent ? shapeSource : null
9+ source: bubbleShape.clipContent ? shapeSource : null
10 visible: !square
11 }
12
13
14=== modified file 'app/components/Walkthrough/Slide1.qml'
15--- app/components/Walkthrough/Slide1.qml 2015-05-03 16:22:31 +0000
16+++ app/components/Walkthrough/Slide1.qml 2015-09-25 08:13:29 +0000
17@@ -37,11 +37,12 @@
18 horizontalCenter: parent.horizontalCenter
19 }
20 height: (parent.height - bodyText.contentHeight - introductionText.height - 4*units.gu(4))/2
21- image: Image {
22+ radius: "medium"
23+ source: Image {
24 id: centerImage
25 source: Qt.resolvedUrl("../../graphics/music-app@30.png")
26 }
27- radius: "medium"
28+
29 width: height
30 }
31
32
33=== modified file 'debian/changelog'
34--- debian/changelog 2015-09-08 14:18:46 +0000
35+++ debian/changelog 2015-09-25 08:13:29 +0000
36@@ -3,6 +3,9 @@
37 [ Bartosz Kosiorek ]
38 * Reduce size of images (with tinypng.com) to decrease click size and improve performance
39
40+ [ Victor Thompson ]
41+ * Remove some deprecated code for the UbuntuShape image property.
42+
43 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Tue, 08 Sep 2015 10:08:49 +0200
44
45 music-app (2.2ubuntu1) vivid; urgency=medium

Subscribers

People subscribed via source and target branches