Merge lp:~nick-dedekind/ubuntu-settings-components/standard-item-preferred-values into lp:~registry/ubuntu-settings-components/trunk

[Nick Dedekind]

Don't use preferred values inside Standard item compoonent Loader.

Don't use preferred values inside Standard item compoonent Loader.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/111/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/18/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/111/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Yes

review: Approve

=== modified file 'plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml	2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml	2015-04-30 11:11:20 +0000
@@ -33,8 +33,8 @@
 
     component: Component {
         UbuntuShape {
-            height: label.implicitHeight + units.gu(2)
-            width: label.implicitWidth + units.gu(2)
+            implicitHeight: label.implicitHeight + units.gu(2)
+            implicitWidth: label.implicitWidth + units.gu(2)
 
             color: Theme.palette.normal.backgroundText
             radius: "medium"

=== modified file 'plugins/Ubuntu/Settings/Menus/StandardMenu.qml'
--- plugins/Ubuntu/Settings/Menus/StandardMenu.qml	2014-09-22 16:37:31 +0000
+++ plugins/Ubuntu/Settings/Menus/StandardMenu.qml	2015-04-30 11:11:20 +0000
@@ -74,9 +74,6 @@
             id: componentLoader
             asynchronous: false
             visible: status == Loader.Ready
-
-            Layout.preferredHeight: item ? item.height : 0
-            Layout.preferredWidth: item ? item.width : 0
         }
     }
 }

=== modified file 'plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml	2014-08-14 11:51:14 +0000
+++ plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml	2015-04-30 11:11:20 +0000
@@ -30,8 +30,8 @@
         Rectangle {
             id: activeIcon
             objectName: "activeIcon"
-            width: checkMark.width + units.gu(1.5)
-            height: checkMark.height + units.gu(1.5)
+            implicitWidth: checkMark.width + units.gu(1.5)
+            implicitHeight: checkMark.height + units.gu(1.5)
             radius: width / 2
             antialiasing: true
             color: Theme.palette.normal.backgroundText