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

QmlDesigner.NodeInstances: Deactivate componentComplete in VME

Browse Source 
Change-Id: I18c80e0a6d3206ff863b0466d43375fdb64a6b80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2012-11-07 15:45:31 +01:00
committed by Thomas Hartmann
parent 4b00085a51
commit 7ef1f9d124
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+1
View File
@@ -45,6 +45,7 @@ Qt5NodeInstanceServer::Qt5NodeInstanceServer(NodeInstanceClientInterface *nodeIn
{
addImportString("import QtQuick 2.0\n");
DesignerSupport::activateDesignerAnimationMode();
DesignerSupport::deactivateComponentComplete();
}
Qt5NodeInstanceServer::~Qt5NodeInstanceServer()
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
+14 -5
View File
@@ -448,13 +448,22 @@ void QuickItemNodeInstance::refresh()
repositioning(quickItem());
}
void doComponentCompleteRecursive(QQuickItem *item)
{
if (item) {
if (DesignerSupport::isComponentComplete(item))
return;
foreach (QQuickItem *childItem, item->childItems())
doComponentCompleteRecursive(childItem);
static_cast<QQmlParserStatus*>(item)->componentComplete();
}
}
void QuickItemNodeInstance::doComponentComplete()
{
if (quickItem()) {
if (DesignerSupport::isComponentComplete(quickItem()))
return;
static_cast<QQmlParserStatus*>(quickItem())->componentComplete();
}
doComponentCompleteRecursive(quickItem());
quickItem()->update();
}