Merge lp:~mzanetti/ubuntu-calculator-app/fix-icon-in-layout into lp:ubuntu-calculator-app

[Michael Zanetti]

fix Icon in layout

The Icon seems a bit picky when it comes to sizing. RowLayout
doesn't care about the size of items, it overwrites them.
The combination of the two a) produces warnings and b) makes
the app freeze sometimes (for example on my desktop).

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:243
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/29/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/189/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/29/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

Work ok for me

review: Approve

=== modified file 'app/ui/FavouritePage.qml'
--- app/ui/FavouritePage.qml	2015-11-09 14:18:18 +0000
+++ app/ui/FavouritePage.qml	2015-11-27 16:42:43 +0000
@@ -76,8 +76,8 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 Icon {
                     id: favouriteIcon
-                    height: parent.height - units.gu(2)
-                    width: height
+                    Layout.preferredHeight: parent.height - units.gu(2)
+                    Layout.preferredWidth: height
 
                     Layout.alignment: Qt.AlignVCenter