Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-1354753 into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

[UbuntuShape] Added detailed doc for borderSource.

[UbuntuShape] Added detailed doc for borderSource.

[Zsombor Egri (zsombi)]

A small comment inline.

review: Needs Fixing

[lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-1354753]

1335. By Loïc Molinari on 2014-11-19

[UbuntuShape] Removed sentence from borderSource doc.

[Zsombor Egri (zsombi)]

Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1334
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1235/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6572/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/1068
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1067
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1067/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/1067
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6145/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7824
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7824/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15992

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp'
--- modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-09-10 18:04:50 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-11-19 12:23:24 +0000
@@ -84,11 +84,15 @@
 */
 
 /*!
-    \deprecated
-    \qmlproperty url UbuntuShape::borderSource
-
-    The image used as a border.
-    We plan to expose that feature through styling properties.
+    \qmlproperty string UbuntuShape::borderSource
+
+    This property defines the look of the shape borders. The supported strings
+    are \c "radius_idle.sci" providing an idle button style and
+    "radius_pressed.sci" providing a pressed button style. Any other strings
+    (like the empty one "") disables styling. Default value is \c
+    "radius_idle.sci".
+
+    \note We plan to expose that feature through styling properties.
 */
 
 /*!