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

QmlDesigner: Improve NodeInstanceServer::hasInstance

Browse Source 
Test if instance is valid.

Change-Id: I748f3f95a2ad0669899e8029fdde4de0658ad11b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-06-17 14:59:17 +02:00
parent 6c33c98a24
commit 87e518ab53
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
View File

@@ -145,7 +145,7 @@ bool NodeInstanceServer::hasInstanceForId(qint32 id) const
if (id < 0)
return false;
return m_idInstanceHash.contains(id);
return m_idInstanceHash.contains(id) && m_idInstanceHash.value(id).isValid();
}
ServerNodeInstance NodeInstanceServer::instanceForObject(QObject *object) const
@@ -159,7 +159,7 @@ bool NodeInstanceServer::hasInstanceForObject(QObject *object) const
if (object == 0)
return false;
return m_objectInstanceHash.contains(object);
return m_objectInstanceHash.contains(object) && m_objectInstanceHash.value(object).isValid();
}
void NodeInstanceServer::setRenderTimerInterval(int timerInterval)

4
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp
View File

@@ -145,7 +145,7 @@ bool NodeInstanceServer::hasInstanceForId(qint32 id) const
if (id < 0)
return false;
return m_idInstanceHash.contains(id);
return m_idInstanceHash.contains(id) && m_idInstanceHash.value(id).isValid();
}
ServerNodeInstance NodeInstanceServer::instanceForObject(QObject *object) const
@@ -159,7 +159,7 @@ bool NodeInstanceServer::hasInstanceForObject(QObject *object) const
if (object == 0)
return false;
return m_objectInstanceHash.contains(object);
return m_objectInstanceHash.contains(object) && m_objectInstanceHash.value(object).isValid();
}
void NodeInstanceServer::setRenderTimerInterval(int timerInterval)