From 9a8881bf3eca6d4589c056908fd3541c1a2a6eb5 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 24 Mar 2017 15:14:07 +0100 Subject: Pass a parent to QQmlContexts To avoid crashes in the future. Task-number: QTBUG-59532 Change-Id: Ie81f95939fc5655567f9d987cf040daf3a32df43 Reviewed-by: J-P Nurmi --- src/quicktemplates2/qquickdialogbuttonbox.cpp | 2 +- src/quicktemplates2/qquickoverlay.cpp | 2 +- src/quicktemplates2/qquickstackelement.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index a912ba6a..f1971635 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -312,7 +312,7 @@ QQuickAbstractButton *QQuickDialogButtonBoxPrivate::createStandardButton(QPlatfo QQmlContext *creationContext = delegate->creationContext(); if (!creationContext) creationContext = qmlContext(q); - QQmlContext *context = new QQmlContext(creationContext); + QQmlContext *context = new QQmlContext(creationContext, q); context->setContextObject(q); QObject *object = delegate->beginCreate(context); diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp index e3910509..c72979ae 100644 --- a/src/quicktemplates2/qquickoverlay.cpp +++ b/src/quicktemplates2/qquickoverlay.cpp @@ -80,7 +80,7 @@ static QQuickItem *createDimmer(QQmlComponent *component, QQuickPopup *popup, QQ QQmlContext *creationContext = component->creationContext(); if (!creationContext) creationContext = qmlContext(parent); - QQmlContext *context = new QQmlContext(creationContext); + QQmlContext *context = new QQmlContext(creationContext, parent); context->setContextObject(popup); item = qobject_cast(component->beginCreate(context)); } diff --git a/src/quicktemplates2/qquickstackelement.cpp b/src/quicktemplates2/qquickstackelement.cpp index 27331afe..a3bb840e 100644 --- a/src/quicktemplates2/qquickstackelement.cpp +++ b/src/quicktemplates2/qquickstackelement.cpp @@ -173,7 +173,7 @@ bool QQuickStackElement::load(QQuickStackView *parent) QQmlContext *creationContext = component->creationContext(); if (!creationContext) creationContext = qmlContext(parent); - context = new QQmlContext(creationContext); + context = new QQmlContext(creationContext, parent); context->setContextObject(parent); QQuickStackIncubator incubator(this); -- cgit v1.2.3