feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlPuppet: Remove redundant null validations

Browse Source 
Change-Id: I909119533646e0b29724212f764eb2685b683044
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Orgad Shaneh
2014-05-05 17:20:49 +03:00
committed by Orgad Shaneh
parent eca7fce452
commit 41fe19cdc7
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+2 -3
View File
@@ -947,8 +947,7 @@ QObject *ObjectNodeInstance::createComponentWrap(const QString &nodeSource, cons
QObject *object = component;
tweakObjects(object);
if (object && context)
QQmlEngine::setContextForObject(object, context);
QQmlEngine::setContextForObject(object, context);
QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
@@ -1143,7 +1142,7 @@ QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorN
tweakObjects(object);
if (object && context)
if (object)
QQmlEngine::setContextForObject(object, context);
QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
+2 -3
View File
@@ -892,8 +892,7 @@ QObject *ObjectNodeInstance::createComponentWrap(const QString &nodeSource, cons
QObject *object = component;
tweakObjects(object);
if (object && context)
QDeclarativeEngine::setContextForObject(object, context);
QDeclarativeEngine::setContextForObject(object, context);
QDeclarativeEngine::setObjectOwnership(object, QDeclarativeEngine::CppOwnership);
@@ -989,7 +988,7 @@ QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorN
tweakObjects(object);
if (object && context)
if (object)
QDeclarativeEngine::setContextForObject(object, context);
QDeclarativeEngine::setObjectOwnership(object, QDeclarativeEngine::CppOwnership);