From 169ba3b6f744e81576a78f0ab701b4e306dbec5a Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Fri, 26 Aug 2022 14:18:05 +0300
Subject: [PATCH] QmlDesigner: Convert the form editor preview image to correct
 format

We were passing the image with premultiplied alpha obtained from
QSGRhiLayer::toImage() to be shown in form editor. This corrupts the
colors in with 3D materials having partially transparent colors.
Converting the image to QImage::Format_ARGB32 format fixes the issue.

Fixes: QDS-7474
Change-Id: Id0b689d7e2d9fc111e98f28b18db0af3ac30041f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
index 3ccd6c60dce..dc6632efe26 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
@@ -489,7 +489,7 @@ QImage Qt5NodeInstanceServer::grabItem(QQuickItem *item)
         layer->scheduleUpdate();
 
         if (layer->updateTexture())
-            renderImage = layer->toImage();
+            renderImage = layer->toImage().convertToFormat(QImage::Format_ARGB32);
         else
             qWarning() << __FUNCTION__ << "Failed to update layer texture";