From 808094e9e1f8cd3ad78ae0947f388513485b2bef Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 9 Oct 2014 13:37:11 +0200 Subject: [PATCH] QmlDesigner: avoid setContext warning if there is already one Change-Id: I2d23f8f18cce11bdfbdcb4a8d9d6d99fec7d20e6 Reviewed-by: Thomas Hartmann --- .../qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index 5e023f320b7..3ed7fbf83d9 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -1158,7 +1158,7 @@ QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorN tweakObjects(object); - if (object) + if (object && QQmlEngine::contextForObject(object) == 0) QQmlEngine::setContextForObject(object, context); QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);