Merge lp:~zsombi/ubuntu-ui-toolkit/labelCrash into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Disconnect enabled signal in Label in destructor, so functor call will not be handled when QQuickItem triggers enabled change.

[lp:~zsombi/ubuntu-ui-toolkit/labelCrash]

1910. By Zsombor Egri on 2016-03-25

fix

[Zoltan Balogh (bzoltan)]

review: Approve

[Tim Peeters (tpeeters)]

Works

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1910
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/348/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2106/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/348/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1910
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/568/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2107/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/568/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1910
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/323/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2110/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/323/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1909
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/350/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2116/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/350/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1909
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/570/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2117/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/570/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1909
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/325/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2119/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/325/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1910
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/580/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2134/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/580/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1909
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/582/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2140/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/582/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1909
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/206/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/570
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/582
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/582/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/350
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/325
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2141/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2117
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2140
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2116
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2119

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/206/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/plugin/uclabel.cpp'
--- src/Ubuntu/Components/plugin/uclabel.cpp	2016-03-14 18:56:42 +0000
+++ src/Ubuntu/Components/plugin/uclabel.cpp	2016-03-25 10:23:59 +0000
@@ -105,7 +105,8 @@
 }
 UCLabel::~UCLabel()
 {
-    delete d_ptr;
+    // disconnect functor, so QQuickItem's enabledChanged won't call into the invalid functor
+    disconnect(this, &UCLabel::enabledChanged, this, &UCLabel::postThemeChanged);
 }
 
 QColor UCLabelPrivate::getDefaultColor(QQuickItem *item, UCTheme *theme)

=== modified file 'src/Ubuntu/Components/plugin/uclabel.h'
--- src/Ubuntu/Components/plugin/uclabel.h	2016-03-11 19:28:41 +0000
+++ src/Ubuntu/Components/plugin/uclabel.h	2016-03-25 10:23:59 +0000
@@ -87,12 +87,10 @@
     void fontSizeChanged();
 
 private:
+    QScopedPointer<UCLabelPrivate> d_ptr;
+    Q_DECLARE_PRIVATE_D(d_ptr.data(), UCLabel)
+    Q_DISABLE_COPY(UCLabel)
     Q_PRIVATE_SLOT(d_func(), void updateRenderType())
-
-    UCLabelPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(UCLabel)
-
-    Q_DISABLE_COPY(UCLabel)
 };
 
 QML_DECLARE_TYPE(UCLabel)

=== modified file 'tests/unit_x11/tst_components/tst_label_extras.qml'
--- tests/unit_x11/tst_components/tst_label_extras.qml	2016-03-14 18:56:42 +0000
+++ tests/unit_x11/tst_components/tst_label_extras.qml	2016-03-25 10:23:59 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import QtTest 1.0
-import Ubuntu.Test 1.0
+import Ubuntu.Test 1.3
 import Ubuntu.Components 1.3
 
 Item {
@@ -43,6 +43,22 @@
         }
     }
 
+    Component {
+        id: labelModel
+        ListView {
+            anchors.fill: parent
+            model: [ "Lorem ipsum dolor sit amet" ]
+            enabled: false
+            delegate: Label {
+                id: ubuntuIdLabel
+                objectName: "ubuntuIdLabel"
+                text: modelData
+                elide: Text.ElideRight
+                property string email: modelData
+            }
+        }
+    }
+
     Loader {
         id: testLoader
     }
@@ -77,5 +93,10 @@
             theme.palette.normal.backgroundText = UbuntuColors.blue;
             verify(test.color != theme.palette.normal.backgroundText);
         }
+
+        function test_label_destruction_crash_bug1560044() {
+            var test = loadTest(labelModel);
+            testLoader.sourceComponent = null;
+        }
     }
 }

=== modified file 'tests/unit_x11/tst_components/tst_listitem_extras.qml'
--- tests/unit_x11/tst_components/tst_listitem_extras.qml	2015-10-26 11:48:44 +0000
+++ tests/unit_x11/tst_components/tst_listitem_extras.qml	2016-03-25 10:23:59 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import QtTest 1.0
-import Ubuntu.Test 1.0
+import Ubuntu.Test 1.3
 import Ubuntu.Components 1.3
 
 Item {