Merge lp:~nicolas-doffay/ubuntu-ui-toolkit/crossfadeimage-size-output-fix into lp:ubuntu-ui-toolkit

Proposed by Nicolas d'Offay
Status: Merged
Approved by: Zsombor Egri
Approved revision: 712
Merged at revision: 720
Proposed branch: lp:~nicolas-doffay/ubuntu-ui-toolkit/crossfadeimage-size-output-fix
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 12 lines (+1/-1)
1 file modified
modules/Ubuntu/Components/CrossFadeImage.qml (+1/-1)
To merge this branch: bzr merge lp:~nicolas-doffay/ubuntu-ui-toolkit/crossfadeimage-size-output-fix
Reviewer Review Type Date Requested Status
Zsombor Egri Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+181836@code.launchpad.net

Commit message

Fixed output issue: CrossFadeImage.qml:39: Unable to assign QSize to QSizeF

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

nice fix :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/CrossFadeImage.qml'
2--- modules/Ubuntu/Components/CrossFadeImage.qml 2013-07-08 19:34:55 +0000
3+++ modules/Ubuntu/Components/CrossFadeImage.qml 2013-08-23 14:05:39 +0000
4@@ -82,7 +82,7 @@
5 /*!
6 The actual width and height of the loaded image
7 */
8- readonly property size sourceSize: internals.loadingImage.sourceSize
9+ readonly property size sourceSize: Qt.size(internals.loadingImage.sourceSize.width, internals.loadingImage.sourceSize.height)
10
11 /*!
12 \qmlproperty enumeration status

Subscribers

People subscribed via source and target branches

to status/vote changes: