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

[Zsombor Egri]

Fixing corner case for Label having a styled child.

[Cris Dywan (kalikiana)]

This makes sense indeed seeing that there is no 'theme' property in the case of the Label and Theme* would be null. Good catch!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1680
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2368/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1096
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1098
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1098/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1095

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

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Move the diff against trunk

review: Disapprove

Unmerged revisions

1680. By Zsombor Egri on 2015-10-08

fix

1679. By Zsombor Egri on 2015-10-08

test case reproducing the error

=== modified file 'src/Ubuntu/Components/plugin/ucthemingextension.cpp'
--- src/Ubuntu/Components/plugin/ucthemingextension.cpp	2015-09-21 14:24:05 +0000
+++ src/Ubuntu/Components/plugin/ucthemingextension.cpp	2015-10-08 08:51:34 +0000
@@ -128,8 +128,12 @@
     // make sure we have these handlers attached to each intermediate item
     QQuickItem *oldThemedAscendant = UCThemingExtension::ascendantThemed(m_prevParent);
     QQuickItem *newThemedAscendant = UCThemingExtension::ascendantThemed(newParent);
-    UCTheme *oldTheme = oldThemedAscendant ? oldThemedAscendant->property("theme").value<UCTheme*>() : &UCTheme::defaultTheme();
-    UCTheme *newTheme = newThemedAscendant ? newThemedAscendant->property("theme").value<UCTheme*>() : &UCTheme::defaultTheme();
+    UCItemAttached *oldAscendantAttached = static_cast<UCItemAttached*>(qmlAttachedPropertiesObject<UCItemAttached>(oldThemedAscendant, false));
+    UCItemAttached *newAscendantAttached = static_cast<UCItemAttached*>(qmlAttachedPropertiesObject<UCItemAttached>(newThemedAscendant, false));
+    UCThemingExtension *oldAscendantExtension = oldAscendantAttached ? oldAscendantAttached->m_extension : Q_NULLPTR;
+    UCThemingExtension *newAscendantExtension = newAscendantAttached ? newAscendantAttached->m_extension : Q_NULLPTR;
+    UCTheme *oldTheme = oldAscendantExtension ? oldAscendantExtension->getTheme() : &UCTheme::defaultTheme();
+    UCTheme *newTheme = newAscendantExtension ? newAscendantExtension->getTheme() : &UCTheme::defaultTheme();
 
     if (oldTheme != newTheme) {
         // send the event to m_item first
 
=== added file 'tests/unit_x11/tst_components/tst_label_extras.qml'
--- tests/unit_x11/tst_components/tst_label_extras.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_label_extras.qml	2015-10-08 08:51:34 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.3
+
+Item {
+    id: main
+    width: units.gu(40)
+    height: units.gu(70)
+
+    Component {
+        id: labelWithButton
+        Label {
+            text: "Something"
+            Button {
+                objectName: "childButton"
+                text: "Something else"
+                onClicked: visible = false
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        name: "Label13Extras"
+        when: windowShown
+
+        function test_label_with_button_bug1503901() {
+            // this should SEGFAULT on error!
+            var test = labelWithButton.createObject(main);
+            test.destroy();
+        }
+    }
+}