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

[Albert Astals Cid]

Fix valgrind warning by not emitting reset on model destructor

That won't be supported until Qt 5.4

More info at https://bugreports.qt-project.org/browse/QTBUG-39780

Warning was

==16693== Invalid read of size 8
==16693== at 0x72B19A0: QQmlContext::isValid() const (qqmlcontext.cpp:231)
==16693== by 0x736C82B: QQmlDelegateModelPrivate::emitChanges() (qqmldelegatemodel.cpp:1412)
==16693== by 0x7372AE6: QQmlDelegateModel::_q_modelReset() (qqmldelegatemodel.cpp:1463)
==16693== by 0x7397224: QQmlDelegateModel::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (moc_qqmldelegatemodel_p.cpp:196)
==16693== by 0x739769E: QQmlDelegateModel::qt_metacall(QMetaObject::Call, int, void**) (moc_qqmldelegatemodel_p.cpp:292)
==16693== by 0x66379CC: QMetaObject::activate(QObject*, int, int, void**) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0)
==16693== by 0x65AEEFD: QAbstractItemModel::endResetModel() (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0)
==16693== by 0x23461EFD: FakeIndicatorsModel::unload() (fakeindicatorsmodel.cpp:53)
==16693== by 0x23461E13: FakeIndicatorsModel::~FakeIndicatorsModel() (fakeindicatorsmodel.cpp:34)
==16693== by 0x2345C073: QQmlPrivate::QQmlElement<FakeIndicatorsModel>::~QQmlElement() (in /home/tsdgeos_work/phablet/unity8/investigate_test_shell_crash/builddir/tests/mocks/Unity/Indicators/libIndicatorsFakeQml.so)
==16693== by 0x2345C0A3: QQmlPrivate::QQmlElement<FakeIndicatorsModel>::~QQmlElement() (qqmlprivate.h:106)
==16693== by 0x663636B: QObjectPrivate::deleteChildren() (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0)
==16693== Address 0x1862d448 is 8 bytes inside a block of size 16 free'd
==16693== at 0x4C2C2BC: operator delete(void*) (vg_replace_malloc.c:503)
==16693== by 0x72B21B8: QQmlContextData::destroy() (qqmlcontext.cpp:647)
==16693== by 0x7293458: QQmlPrivate::qdeclarativeelement_destructor(QObject*) (qqmlengine.cpp:612)
==16693== by 0x6C0CADD: QQmlPrivate::QQmlElement<QQuickItem>::~QQmlElement() (qqmlprivate.h:105)
==16693== by 0x663636B: QObjectPrivate::deleteChildren() (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0)
==16693== by 0x663F0EB: QObject::~QObject() (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0)
==16693== by 0x6BF64B5: QQuickItem::~QQuickItem() (qquickitem.cpp:2064)
==16693== by 0x6C0CAE5: QQmlPrivate::QQmlElement<QQuickItem>::~QQmlElement() (qqmlprivate.h:106)
==16693== by 0x663636B: QObjectPrivate::deleteChildren() (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0)
==16693== by 0x663F0EB: QObject::~QObject() (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0)
==16693== by 0x6BF64B5: QQuickItem::~QQuickItem() (qquickitem.cpp:2064)
==16693== by 0x6C0CAE5: QQmlPrivate::QQmlElement<QQuickItem>::~QQmlElement() (qqmlprivate.h:106)

* 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?
No, but it's only test code and the valgrind warning is gone

* Did you make sure that your branch does not contain spurious tags?
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

[Michael Zanetti (mzanetti)]

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

yes

 * Did CI run pass? If not, please explain why.

waiting...

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:997
http://jenkins.qa.ubuntu.com/job/unity8-ci/3280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1392
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/374
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/374/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2341
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9082

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3280/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp'
--- tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp	2014-03-03 12:01:09 +0000
+++ tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp	2014-07-01 09:58:18 +0000
@@ -31,7 +31,7 @@
 /*! \internal */
 FakeIndicatorsModel::~FakeIndicatorsModel()
 {
-    unload();
+    qDeleteAll(m_indicators);
 }
 
 int FakeIndicatorsModel::count() const