diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2018-04-03 12:35:26 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2018-04-05 09:20:31 +0000 |
commit | 906d2ac9b56fb10310bdea4fc0254f78888f42d9 (patch) | |
tree | 2f3e4cfcfe55b1ac7752a9414749039c06f8f00e /share/qtcreator | |
parent | 9c6061be9b1b7b46acadcc3666b2127213b4db5c (diff) | |
download | qt-creator-906d2ac9b56fb10310bdea4fc0254f78888f42d9.tar.gz |
QmlDesigner: Read contentItem after completing
This avoids issues with deferred properties.
Change-Id: Ie9cc0eaa3468bcb21e4817f8c5e3c1b97c8fc99c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'share/qtcreator')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp index 647d1d7470..a20e0350ae 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -193,14 +193,14 @@ void QuickItemNodeInstance::doComponentComplete() { ObjectNodeInstance::doComponentComplete(); - QQmlProperty contentItemProperty(quickItem(), "contentItem", engine()); - if (contentItemProperty.isValid()) - m_contentItem = contentItemProperty.read().value<QQuickItem*>(); - QmlPrivateGate::disableTextCursor(quickItem()); DesignerSupport::emitComponentCompleteSignalForAttachedProperty(quickItem()); + QQmlProperty contentItemProperty(quickItem(), "contentItem", engine()); + if (contentItemProperty.isValid()) + m_contentItem = contentItemProperty.read().value<QQuickItem*>(); + quickItem()->update(); } |