Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-dont-use-deprecated-shape-properties into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

Ensured components, styles, examples and tests use the new UbuntuShape properties (not deprecated).

Ensured components, styles, examples and tests use the new UbuntuShape properties (not deprecated).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1353
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1608/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2023/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/335/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/335/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2021/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1608/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Second nobrainer :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/892/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/199
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/199/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/199

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

1.2.1458+15.04.20150327bzr1354pkg0vivid200/modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml:136:5: QML UbuntuShape: 'borderSource' is deprecated. Use 'aspect' instead.
Layout change should not happen when component is not defined
Layout change should not happen when component is not defined
file:///tmp/buildd/ubuntu-ui-toolkit-1.2.1458+15.04.20150327bzr1354pkg0vivid200/tests/unit_x11/tst_layouts/Visibility.qml:64:29: "UbuntuShape.backgroundColor" is not available in Ubuntu.Components 1.1.
                                 backgroundColor: "red"
                                 ^

The error must be fixed by updating the import version in Visibility.qml

It would be nice to fix the warnings as well.

review: Needs Fixing

[Tim Peeters (tpeeters)]

Thanks, happroving.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1355
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1700/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2410/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/428/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/427/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2408/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1700/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/918/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/225
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/225/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/225

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1357
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1701/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/431
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/431/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2410
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19869

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1701/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/925/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/233/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/232/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/232/console

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Conflicts!

[lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-dont-use-deprecated-shape-properties]

1358. By Loïc Molinari on 2015-07-22

Merged lp:ubuntu-ui-toolkit/staging.

Unmerged revisions

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Colors.qml'
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Colors.qml	2015-07-22 13:15:37 +0000
@@ -29,43 +29,43 @@
         TemplateRow {
             title: i18n.tr("Orange")
             UbuntuShape {
-                color: UbuntuColors.orange
+                backgroundColor: UbuntuColors.orange
             }
         }
         TemplateRow {
             title: i18n.tr("Light grey")
             UbuntuShape {
-                color: UbuntuColors.lightGrey
+                backgroundColor: UbuntuColors.lightGrey
             }
         }
         TemplateRow {
             title: i18n.tr("Dark grey")
             UbuntuShape {
-                color: UbuntuColors.darkGrey
+                backgroundColor: UbuntuColors.darkGrey
             }
         }
         TemplateRow {
             title: i18n.tr("Red")
             UbuntuShape {
-                color: UbuntuColors.red
+                backgroundColor: UbuntuColors.red
             }
         }
         TemplateRow {
             title: i18n.tr("Green")
             UbuntuShape {
-                color: UbuntuColors.green
+                backgroundColor: UbuntuColors.green
             }
         }
         TemplateRow {
             title: i18n.tr("Blue")
             UbuntuShape {
-                color: UbuntuColors.blue
+                backgroundColor: UbuntuColors.blue
             }
         }
         TemplateRow {
             title: i18n.tr("Purple")
             UbuntuShape {
-                color: UbuntuColors.purple
+                backgroundColor: UbuntuColors.purple
             }
         }
     }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2015-04-29 07:21:29 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2015-07-22 13:15:37 +0000
@@ -352,7 +352,7 @@
                         Toolkit.UbuntuShape {
                             anchors { left: parent.left; right: parent.right }
                             height: index % 2 == 0 ? units.gu(6) : units.gu(18)
-                            color: "khaki"
+                            backgroundColor: "khaki"
                         }
                     }
                 }
@@ -393,7 +393,7 @@
                         Toolkit.UbuntuShape {
                             anchors { left: parent.left; right: parent.right }
                             height: index % 2 == 0 ? units.gu(6) : units.gu(18)
-                            color: "khaki"
+                            backgroundColor: "khaki"
                         }
                     }
                 }

=== modified file 'modules/Ubuntu/Components/ListItems/1.3/IconVisual.qml'
--- modules/Ubuntu/Components/ListItems/1.3/IconVisual.qml	2015-04-29 07:21:29 +0000
+++ modules/Ubuntu/Components/ListItems/1.3/IconVisual.qml	2015-07-22 13:15:37 +0000
@@ -53,6 +53,6 @@
         id: shape
         visible: iconVisual.hasFrame
         anchors.fill: parent
-        image: icon
+        source: icon
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml	2015-07-22 13:15:37 +0000
@@ -110,9 +110,9 @@
 
     UbuntuShape {
         anchors.fill: parent
-        borderSource: "none"
-        color: theme.palette.normal.overlay
-        image: bubbleShape.clipContent ? shapeSource : null
+        aspect: UbuntuShape.Flat
+        backgroundColor: theme.palette.normal.overlay
+        source: bubbleShape.clipContent ? shapeSource : null
         visible: !square
     }
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml	2015-04-25 07:36:13 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml	2015-07-22 13:15:37 +0000
@@ -123,21 +123,23 @@
     UbuntuShape {
         id: background
         anchors.fill: parent
-        borderSource: "radius_idle.sci"
-        visible: stroke ? false : ((color.a != 0.0) || backgroundSource)
-        image: backgroundSource
+        borderSource: "radius_idle.sci"  // Deprecated, use a dedicated shape.
+        visible: stroke ? false : ((backgroundColor.a != 0.0) || backgroundSource)
+        source: backgroundSource
 
-        color: stroke ? "" : (backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color)))
+        backgroundColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color))
+        secondaryBackgroundColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color))
+        backgroundMode: isGradient ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor
         opacity: styledItem.enabled ? 1.0 : 0.6
-        gradientColor: stroke ? "" : (backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color)))
     }
 
     UbuntuShape {
         id: backgroundPressed
         anchors.fill: parent
-        color: stroke ? button.strokeColor : background.color
-        gradientColor: stroke ? button.strokeColor : background.gradientColor
-        borderSource: "radius_pressed.sci"
+        backgroundColor: stroke ? button.strokeColor : background.backgroundColor
+        secondaryBackgroundColor: background.secondaryBackgroundColor
+        backgroundMode: stroke ? UbuntuShape.SolidColor : UbuntuShape.VerticalGradient
+        borderSource: "radius_pressed.sci"  // Deprecated, use a dedicated shape.
         opacity: button.pressed ? 1.0 : 0.0
         Behavior on opacity {
             NumberAnimation {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml	2015-07-22 13:15:37 +0000
@@ -86,7 +86,7 @@
                 }
                 PropertyChanges {
                     target: background
-                    color: checkBoxStyle.checkedBackgroundColor
+                    backgroundColor: checkBoxStyle.checkedBackgroundColor
                 }
             },
             State {
@@ -97,7 +97,7 @@
                 }
                 PropertyChanges {
                     target: background
-                    color: checkBoxStyle.uncheckedBackgroundColor
+                    backgroundColor: checkBoxStyle.uncheckedBackgroundColor
                 }
             }
         ]

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml	2015-04-25 07:36:13 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml	2015-07-22 13:15:37 +0000
@@ -165,8 +165,7 @@
                 topMargin: comboListMargin
             }
             visible: true
-            borderSource: "radius_idle.sci"
-            image: listContent
+            source: listContent
         }
 
         Image {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml	2015-04-29 07:21:29 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml	2015-07-22 13:15:37 +0000
@@ -61,7 +61,7 @@
     UbuntuShape {
         anchors.fill: parent
         radius: "medium"
-        image: shapeSource
+        source: shapeSource
     }
 
     ShaderEffectSource {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml	2015-04-25 07:36:13 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml	2015-07-22 13:15:37 +0000
@@ -23,6 +23,6 @@
     UbuntuShape {
         id: background
         anchors.fill: parent
-        color: "white"
+        backgroundColor: "white"
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml	2015-04-25 07:36:13 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml	2015-07-22 13:15:37 +0000
@@ -32,6 +32,6 @@
         height: styledItem.height
         radius: "medium"
 
-        color: Qt.rgba(0, 0, 0, 0.05)
+        backgroundColor: Qt.rgba(0, 0, 0, 0.05)
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml	2015-04-29 07:21:29 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml	2015-07-22 13:15:37 +0000
@@ -59,8 +59,8 @@
     UbuntuShape {
         anchors.fill: parent
         radius: "medium"
-        color: theme.palette.normal.overlay
-        image: shapeSource
+        backgroundColor: theme.palette.normal.overlay
+        source: shapeSource
     }
 
     ShaderEffectSource {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml	2015-07-22 13:15:37 +0000
@@ -81,7 +81,7 @@
         width: units.gu(2)
         height: units.gu(2)
         opacity: 0.97
-        color: theme.palette.normal.overlay
+        backgroundColor: theme.palette.normal.overlay
     }
 
     BubbleShape {

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml	2015-07-22 13:15:37 +0000
@@ -74,7 +74,7 @@
     UbuntuShape {
         id: background
         anchors.fill: parent
-        color: switchStyle.backgroundColor
+        backgroundColor: switchStyle.backgroundColor
         clip: true
 
         UbuntuShape {
@@ -86,7 +86,7 @@
                     PropertyChanges {
                         target: thumb
                         x: rightThumbPosition.x
-                        color: switchStyle.checkedThumbColor
+                        backgroundColor: switchStyle.checkedThumbColor
                     }
                 },
                 State {
@@ -95,7 +95,7 @@
                     PropertyChanges {
                         target: thumb
                         x: leftThumbPosition.x
-                        color: switchStyle.uncheckedThumbColor
+                        backgroundColor: switchStyle.uncheckedThumbColor
                     }
                 }
             ]
@@ -114,7 +114,7 @@
                     }
                     ColorAnimation {
                         target: thumb
-                        properties: "color"
+                        properties: "backgroundColor"
                         duration: UbuntuAnimation.FastDuration
                         easing: UbuntuAnimation.StandardEasing
                     }
@@ -130,7 +130,7 @@
                     }
                     ColorAnimation {
                         target: thumb
-                        properties: "color"
+                        properties: "backgroundColor"
                         duration: UbuntuAnimation.FastDuration
                         easing: UbuntuAnimation.StandardEasing
                     }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml	2015-07-22 13:15:37 +0000
@@ -53,7 +53,7 @@
     property Component background: UbuntuShape {
         property bool error: (styledItem.hasOwnProperty("errorHighlight") && styledItem.errorHighlight && !styledItem.acceptableInput)
         onErrorChanged: (error) ? visuals.errorColor : visuals.backgroundColor;
-        color: visuals.backgroundColor;
+        backgroundColor: visuals.backgroundColor
         anchors.fill: parent
         visible: !styledItem.readOnly
     }

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-06-02 13:37:30 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-07-22 13:15:37 +0000
@@ -35,6 +35,7 @@
 #include <QtQuick/QSGTextureProvider>
 #include <QtQuick/private/qquickimage_p.h>
 #include <QtQuick/private/qsgadaptationlayer_p.h>
+#include <QtQml/qqmlinfo.h>
 #include <math.h>
 
 // Anti-aliasing distance of the contour in pixels.
@@ -751,6 +752,11 @@
 */
 void UCUbuntuShape::setBorderSource(const QString& borderSource)
 {
+    // FIXME(loicm) Commented for now since even if it's deprecated, buttons have to use it in order
+    //     to get a pressed aspect. This is a temporary solution before using a dedicated button
+    //     shape.
+    // qmlInfo(this) << "'borderSource' is deprecated. Use 'aspect' instead.";
+
     if (!(m_flags & AspectSet)) {
         quint8 aspect;
         if (borderSource.endsWith(QString("radius_idle.sci"))) {
@@ -779,6 +785,9 @@
 */
 void UCUbuntuShape::setColor(const QColor& color)
 {
+    qmlInfo(this) << "'color' is deprecated. Use 'backgroundColor', 'secondaryBackgroundColor' and "
+        "'backgroundMode' instead.";
+
     if (!(m_flags & BackgroundApiSet)) {
         const QRgb colorRgb = qRgba(color.red(), color.green(), color.blue(), color.alpha());
         if (m_backgroundColor != colorRgb) {
@@ -805,6 +814,9 @@
 */
 void UCUbuntuShape::setGradientColor(const QColor& gradientColor)
 {
+    qmlInfo(this) << "'gradientColor' is deprecated. Use 'backgroundColor', "
+        "'secondaryBackgroundColor' and 'backgroundMode' instead.";
+
     if (!(m_flags & BackgroundApiSet)) {
         m_flags |= GradientColorSet;
         const QRgb gradientColorRgb = qRgba(
@@ -829,6 +841,8 @@
 */
 void UCUbuntuShape::setImage(const QVariant& image)
 {
+    qmlInfo(this) << "'image' is deprecated. Use 'source' instead.";
+
     if (!(m_flags & SourceApiSet)) {
         QQuickItem* newImage = qobject_cast<QQuickItem*>(qvariant_cast<QObject*>(image));
         if (m_source != newImage) {
@@ -856,6 +870,8 @@
 // maintain it for a while for compatibility reasons.
 void UCUbuntuShape::setStretched(bool stretched)
 {
+    qmlInfo(this) << "'stretched' is deprecated. Use 'sourceFillMode' instead";
+
     if (!(m_flags & SourceApiSet)) {
         if (!!(m_flags & Stretched) != stretched) {
             if (stretched) {
@@ -873,6 +889,8 @@
 // Deprecation layer. Same comment as setStretched().
 void UCUbuntuShape::setHorizontalAlignment(HAlignment horizontalAlignment)
 {
+    qmlInfo(this) << "'horizontalAlignment' is deprecated. Use 'sourceHorizontalAlignment' instead";
+
     if (!(m_flags & SourceApiSet)) {
         if (m_imageHorizontalAlignment != horizontalAlignment) {
             m_imageHorizontalAlignment = horizontalAlignment;
@@ -886,6 +904,8 @@
 // Deprecation layer. Same comment as setStretched().
 void UCUbuntuShape::setVerticalAlignment(VAlignment verticalAlignment)
 {
+    qmlInfo(this) << "'horizontalAlignment' is deprecated. Use 'sourceVerticalAlignment' instead";
+
     if (!(m_flags & SourceApiSet)) {
         if (m_imageVerticalAlignment != verticalAlignment) {
             m_imageVerticalAlignment = verticalAlignment;

=== modified file 'tests/unit_x11/tst_layouts/Visibility.qml'
--- tests/unit_x11/tst_layouts/Visibility.qml	2015-03-03 13:20:06 +0000
+++ tests/unit_x11/tst_layouts/Visibility.qml	2015-07-22 13:15:37 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Layouts 1.0
 
 MainView {
@@ -61,7 +61,7 @@
                         UbuntuShape {
                             width: units.gu(20)
                             height: units.gu(20)
-                            color: "red"
+                            backgroundColor: "red"
                             Label { text: "wide" }
                         }
                     }
@@ -74,7 +74,7 @@
                     objectName: "DefaultLayout"
                     width: units.gu(20)
                     height: units.gu(20)
-                    color: "green"
+                    backgroundColor: "green"
                     visible: main.boundValue
                     Label { text: "default" }
                 }