aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@qt.io>2020-07-17 11:17:17 +0200
committerMarco Bubke <marco.bubke@qt.io>2020-07-17 12:24:40 +0000
commitda29ff04334f490ff5daf102d81d77f044992e6c (patch)
tree1edbe5e6e90137c583874241be7a19c9277d356b
parent5b63599473ead47a44d7f1a35634d08aab57d2f7 (diff)
QmlDesigner: Fix prefiew size
Change-Id: I126c50209f2849d0212f0d295b35cba0f25f2728 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
index 6e50012063..50db9b9971 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
@@ -104,7 +104,7 @@ QImage Qt5PreviewNodeInstanceServer::renderPreviewImage()
QSize previewImageSize = boundingRect.size().toSize();
- if (!m_previewSize.isNull())
+ if (m_previewSize.isValid() && !m_previewSize.isNull())
previewImageSize.scale(m_previewSize, Qt::KeepAspectRatio);
QImage previewImage = rootNodeInstance().renderPreviewImage(previewImageSize);
@@ -123,9 +123,6 @@ void Qt5PreviewNodeInstanceServer::changePreviewImageSize(
{
m_previewSize = command.size;
- if (!command.size.isValid())
- m_previewSize = {160, 160};
-
collectItemChangesAndSendChangeCommands();
}