Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-set-shapes-debug-description into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

Set QSGNode debug description on the shape-based nodes to ease renderer debugging.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1459
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1609/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2024
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/339
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/339/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/336
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2022
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2022/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19255

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

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

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/872/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/179/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/179
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/179

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/179/console Failed due to a failure on the build slave. It's been fixed and this MP can be re-approved.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-03-10 13:25:19 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-03-27 16:38:31 +0000
@@ -162,6 +162,9 @@
     m_geometry.setVertexDataPattern(vertexDataPattern);
     setMaterial(&m_material);
     setGeometry(&m_geometry);
+#ifdef QSG_RUNTIME_DESCRIPTION
+    qsgnode_set_description(this, QLatin1String("ubuntushape"));
+#endif
 }
 
 // static

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-03-10 12:16:04 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-03-27 16:38:31 +0000
@@ -67,6 +67,9 @@
     m_geometry.setVertexDataPattern(ShapeNode::vertexDataPattern);
     setMaterial(&m_material);
     setGeometry(&m_geometry);
+#ifdef QSG_RUNTIME_DESCRIPTION
+    qsgnode_set_description(this, QLatin1String("ubuntushapeoverlay"));
+#endif
 }
 
 // static