diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-11-10 16:36:49 +0100 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-11-12 15:09:31 +0000 |
commit | 3d767fcfe1ef2319acbd4b688bbedcaaf3cd80c3 (patch) | |
tree | 044d224aba85605b2046822544bc2606a06df3c2 /share/qtcreator/qml/qmlpuppet | |
parent | 0fea7203a78f7baeee38a4c2e29132004445172a (diff) |
QmlDesigner: Hide windows again
Change-Id: I0b22a8bbaabaf2290aa134aebd0044fd81bb5e56
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp | 6 | ||||
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp index 8ea68bd231..90f959dd2b 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp @@ -82,12 +82,6 @@ void Qt5NodeInstanceServer::initializeView() fileSelector->setExtraSelectors(customSelectors); } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - // View needs to be shown for all puppets before any instances are created in case there is a View3D - quickView()->show(); - quickView()->lower(); -#endif - initializeAuxiliaryViews(); } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp index 1c08b408e6..bc91a47505 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -187,7 +187,6 @@ void QuickItemNodeInstance::initialize(const ObjectNodeInstance::Pointer &object } ObjectNodeInstance::initialize(objectNodeInstance, flags); - quickItem()->update(); } QQuickItem *QuickItemNodeInstance::contentItem() const @@ -542,7 +541,9 @@ void QuickItemNodeInstance::updateDirtyNodesRecursive(QQuickItem *parentItem) co } QmlPrivateGate::disableNativeTextRendering(parentItem); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) DesignerSupport::updateDirtyNode(parentItem); +#endif } void QuickItemNodeInstance::updateAllDirtyNodesRecursive(QQuickItem *parentItem) const |