Merge lp:~aacid/unity8/lvwph_fix_crash_invalid_section_delegate into lp:unity8

[Albert Astals Cid]

Fix crash if a component that is not an Item is given to sectionDelegate

It doesn't matter much since this is not a public component, but it is always nice to be correct

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Andrea Cimitan (cimi)]

waiting CI but yeah seems good so far

[Andrea Cimitan (cimi)]

alpha-blended green CI! (you can't see it here, but is green :))

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
y

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1357/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1795
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/884
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/884
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/884
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1819
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1763
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1763
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1763
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1754
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1754/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1754
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1754/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1754
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1754/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1754
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1754/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1754
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1754/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1754
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1754/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1754
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1754/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1754
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1754/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1754
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1754/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1357/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
--- plugins/Dash/listviewwithpageheader.cpp	2016-04-27 14:59:24 +0000
+++ plugins/Dash/listviewwithpageheader.cpp	2016-05-26 12:41:15 +0000
@@ -286,9 +286,11 @@
         m_sectionDelegate = delegate;
 
         m_topSectionItem = getSectionItem(QString(), false /*watchGeometry*/);
-        m_topSectionItem->setZ(3);
-        QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
-        connect(m_topSectionItem, &QQuickItem::heightChanged, this, &ListViewWithPageHeader::stickyHeaderHeightChanged);
+        if (m_topSectionItem) {
+            m_topSectionItem->setZ(3);
+            QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
+            connect(m_topSectionItem, &QQuickItem::heightChanged, this, &ListViewWithPageHeader::stickyHeaderHeightChanged);
+        }
 
         // TODO create sections for existing items
 
@@ -775,7 +777,7 @@
     }
     m_sectionDelegate->completeCreate();
 
-    if (watchGeometry) {
+    if (watchGeometry && sectionItem) {
         QQuickItemPrivate::get(sectionItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);
     }
 

=== modified file 'tests/plugins/Dash/listviewwithpageheadersectiontest.cpp'
--- tests/plugins/Dash/listviewwithpageheadersectiontest.cpp	2016-02-29 10:47:10 +0000
+++ tests/plugins/Dash/listviewwithpageheadersectiontest.cpp	2016-05-26 12:41:15 +0000
@@ -2195,6 +2195,12 @@
         verifyItem(1, 240., 220., false, "halfheight", false);
     }
 
+    void testInvalidSectionDelegate()
+    {
+        lvwph->setProperty("useBrokenSectionDelegateComponent", true);
+        scrollToBottom();
+    }
+
 private:
     QQuickView *view;
     ListViewWithPageHeader *lvwph;

=== modified file 'tests/plugins/Dash/listviewwithpageheadertestsection.qml'
--- tests/plugins/Dash/listviewwithpageheadertestsection.qml	2016-03-16 10:25:03 +0000
+++ tests/plugins/Dash/listviewwithpageheadertestsection.qml	2016-05-26 12:41:15 +0000
@@ -94,8 +94,13 @@
             }
         }
 
+        property bool useBrokenSectionDelegateComponent: false
         sectionProperty: "type"
-        sectionDelegate: Component {
+        sectionDelegate: useBrokenSectionDelegateComponent ? objectComponent
+                                                           : regularSectionDelegateComponent
+
+        Component {
+            id: regularSectionDelegateComponent
             Rectangle {
                 color: "green"
                 height: section === "" ? 0 : section != "halfheight" ? 40 : 20;
@@ -103,5 +108,11 @@
                 anchors { left: parent.left; right: parent.right }
             }
         }
+
+        Component {
+            id: objectComponent
+            QtObject {
+            }
+        }
     }
 }