From c29f51454364dedc84fdf12a2a792762a804c5e9 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Tue, 7 May 2024 18:04:03 +0200
Subject: [PATCH] QmlDesigner: Fix ColorEditor closing

Fix ColorEditorPopup closing when opening gradient dialog.

Pick-to: qds/4.5
Change-Id: I438bd41d2efff30b372c04bc17c85210811cd0ff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
---
 .../imports/HelperWidgets/ColorEditor.qml                       | 1 +
 .../imports/HelperWidgets/ColorEditorPopup.qml                  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
index 385d01c4df8..cc8247d7063 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
@@ -246,6 +246,7 @@ SecondColumnLayout {
                     supportGradient: colorEditor.supportGradient
                     width: popupDialog.contentWidth
                     visible: popupDialog.visible
+                    parentWindow: popupDialog.window
                 }
 
                 onLoaded: {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
index 2c292c5030f..41f2c433fa9 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
@@ -33,6 +33,8 @@ Column {
 
     property alias gradientModel: gradientModel
 
+    property Window parentWindow: null
+
     property bool isInValidState: false
 
     readonly property real twoColumnWidth: (colorColumn.width - StudioTheme.Values.controlGap) * 0.5