Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-dangling-nodes-prevention into lp:ubuntu-ui-toolkit

[Loïc Molinari]

[UbuntuShape] Prevented dangling nodes in the scene graph.

[UbuntuShape] Prevented dangling nodes in the scene graph.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:617
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/327/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/184
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/184/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1018
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1018/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/869

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/327/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp'
--- modules/Ubuntu/Components/plugin/shapeitem.cpp	2013-07-09 17:05:50 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.cpp	2013-07-11 17:14:32 +0000
@@ -365,6 +365,7 @@
     const QSGTexture* texture = provider ? provider->texture() : NULL;
     if (provider && !texture) {
         update();
+        delete old_node;
         return NULL;
     }