From 5b0bb021152f7e414d22d344b23bce07df29e859 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 23 Sep 2022 14:39:09 +0200
Subject: [PATCH] QmlDesigner: Fix ColorDialog popup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I7f8daa6e9b26ae8244de1f7ab7c7db1dfa9b7e52
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
---
 .../imports/HelperWidgets/ColorEditor.qml                | 9 ---------
 .../imports/HelperWidgets/ColorEditorPopup.qml           | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
index 471d2a4e616..b77addd7da3 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
@@ -288,15 +288,6 @@ SecondColumnLayout {
         id: spacer
     }
 
-    StudioControls.Menu {
-        id: contextMenu
-
-        StudioControls.MenuItem {
-            text: qsTr("Open Color Dialog")
-            onTriggered: colorPalette.showColorDialog(colorEditor.color)
-        }
-    }
-
     Component.onCompleted: popupLoader.determineActiveColorMode()
 
     onBackendValueChanged: {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
index 34574ec7285..c7b260f1247 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
@@ -200,6 +200,15 @@ T.Popup {
         }
     }
 
+    StudioControls.Menu {
+        id: contextMenu
+
+        StudioControls.MenuItem {
+            text: qsTr("Open Color Dialog")
+            onTriggered: colorPalette.showColorDialog(colorEditor.color)
+        }
+    }
+
     GradientModel {
         id: gradientModel
         anchorBackendProperty: anchorBackend