1 files changed, 20 insertions, 3 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
index e3716d8787..852ef16bad 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
@@ -25,10 +25,12 @@
 
 #include "qt5previewnodeinstanceserver.h"
 
-#include "nodeinstanceclientinterface.h"
-#include "statepreviewimagechangedcommand.h"
+#include "changepreviewimagesizecommand.h"
 #include "createscenecommand.h"
+#include "nodeinstanceclientinterface.h"
 #include "removesharedmemorycommand.h"
+#include "statepreviewimagechangedcommand.h"
+
 #include <QQuickView>
 #include <QQuickItem>
 #include <designersupportdelegate.h>
@@ -44,6 +46,7 @@ Qt5PreviewNodeInstanceServer::Qt5PreviewNodeInstanceServer(NodeInstanceClientInt
 
 void Qt5PreviewNodeInstanceServer::createScene(const CreateSceneCommand &command)
 {
+    setTranslationLanguage(command.language());
     initializeView();
     setupScene(command);
     startRenderTimer();
@@ -84,6 +87,7 @@ void Qt5PreviewNodeInstanceServer::collectItemChangesAndSendChangeCommands()
         nodeInstanceClient()->statePreviewImagesChanged(StatePreviewImageChangedCommand(imageContainerVector));
 
         slowDownRenderTimer();
+        handleExtraRender();
         inFunction = false;
     }
 }
@@ -100,7 +104,9 @@ QImage Qt5PreviewNodeInstanceServer::renderPreviewImage()
     QRectF boundingRect = rootNodeInstance().boundingRect();
 
     QSize previewImageSize = boundingRect.size().toSize();
-    previewImageSize.scale(QSize(160, 160), Qt::KeepAspectRatio);
+
+    if (!m_previewSize.isNull())
+        previewImageSize.scale(m_previewSize, Qt::KeepAspectRatio);
 
     QImage previewImage = rootNodeInstance().renderPreviewImage(previewImageSize);
 
@@ -113,4 +119,15 @@ void QmlDesigner::Qt5PreviewNodeInstanceServer::removeSharedMemory(const QmlDesi
         ImageContainer::removeSharedMemorys(command.keyNumbers());
 }
 
+void Qt5PreviewNodeInstanceServer::changePreviewImageSize(
+    const ChangePreviewImageSizeCommand &command)
+{
+    m_previewSize = command.size;
+
+    if (!command.size.isValid())
+        m_previewSize = {160, 160};
+
+    collectItemChangesAndSendChangeCommands();
+}
+
 } // namespace QmlDesigner