Albert Astals Cid has proposed merging lp:~aacid/kubuntu-packaging/qtdeclarative-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
Commit message: QQMLObjectCreator: Pass down parent to subCreator Temporary fix until a better one comes up as suggested in https://bugreports.qt-project.org/browse/QTBUG-39966 Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~aacid/kubuntu-packaging/qtdeclarative-opensource-src/+merge/225119 -- https://code.launchpad.net/~aacid/kubuntu-packaging/qtdeclarative-opensource-src/+merge/225119 Your team Kubuntu Packagers is requested to review the proposed merge of lp:~aacid/kubuntu-packaging/qtdeclarative-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== modified file 'debian/changelog' --- debian/changelog 2014-06-19 19:14:47 +0000 +++ debian/changelog 2014-07-01 08:26:11 +0000 @@ -1,3 +1,9 @@ +qtdeclarative-opensource-src (5.3.0-3ubuntu5) utopic; urgency=medium + + * QQMLObjectCreator: Pass down parent to subCreator + + -- Albert Astals Cid <[email protected]> Tue, 01 Jul 2014 10:17:13 +0200 + qtdeclarative-opensource-src (5.3.0-3ubuntu4) utopic; urgency=medium [ Ricardo Salveti de Araujo ] === added file 'debian/patches/parenttosubcreator_qqmlobjectcreator.patch' --- debian/patches/parenttosubcreator_qqmlobjectcreator.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/parenttosubcreator_qqmlobjectcreator.patch 2014-07-01 08:26:11 +0000 @@ -0,0 +1,24 @@ +commit 249b1a73fdb01fc27e036fc4334925674c281793 +Author: Albert Astals Cid <[email protected]> +Date: Mon Jun 30 17:22:55 2014 +0200 + + Pass down parent to subCreator + + Otherwise the object might get garbage collected while it's being created + + Change-Id: I553c3432d5242bcd89723b72d8f8ae82577abaf9 + Task-number: QTBUG-39966 + +diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp +index 36c7dfb..cceb9b2 100644 +--- a/src/qml/qml/qqmlobjectcreator.cpp ++++ b/src/qml/qml/qqmlobjectcreator.cpp +@@ -1076,7 +1076,7 @@ QObject *QQmlObjectCreator::createInstance(int index, QObject *parent, bool isCo + } + + QQmlObjectCreator subCreator(context, typeRef->component, sharedState.data()); +- instance = subCreator.create(); ++ instance = subCreator.create(-1, parent); + if (!instance) { + errors += subCreator.errors; + return 0; === modified file 'debian/patches/series' --- debian/patches/series 2014-06-18 08:15:27 +0000 +++ debian/patches/series 2014-07-01 08:26:11 +0000 @@ -5,3 +5,4 @@ Make-ItemViews-displayMargin-work-correctly-when-set.patch v4_yarr_jit_push_pop_addressTempRegister.patch fix_qqmlobjectcreator.patch +parenttosubcreator_qqmlobjectcreator.patch
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
