diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-11-12 15:33:45 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-11-12 13:53:07 +0000 |
| commit | 767db9a92b47594701f460c1337e16c6c9c0d827 (patch) | |
| tree | c77f7ab56c45d704bea1d955b380fd2c144549ed | |
| parent | d2293204d4b942ccdede1493ee1ac91f77a5ad5c (diff) | |
QmlPuppet: Disable navigator preview image creation in Qt6
This frequently crashes the puppet. Will be re-enabled once the
underlying issue QTBUG-88320 is fixed.
Task-number: QTBUG-88320
Change-Id: Ie4c1ad914e5bd62dcf3b132cea588ba6fc003bc5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index 07f2398151a..a548b4a451a 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp @@ -583,7 +583,8 @@ void Qt5InformationNodeInstanceServer::renderModelNodeImageView() void Qt5InformationNodeInstanceServer::doRenderModelNodeImageView() { - + // Disable preview in Qt6 until QTBUG-QTBUG-88320 is fixed +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ServerNodeInstance instance; if (m_modelNodePreviewImageCommand.renderItemId() >= 0) instance = instanceForId(m_modelNodePreviewImageCommand.renderItemId()); @@ -594,6 +595,7 @@ void Qt5InformationNodeInstanceServer::doRenderModelNodeImageView() doRenderModelNode3DImageView(); else if (instance.isSubclassOf("QQuickItem")) doRenderModelNode2DImageView(); +#endif } void Qt5InformationNodeInstanceServer::doRenderModelNode3DImageView() |