From 469647db3dd091c5a617e15b0bb676a911102038 Mon Sep 17 00:00:00 2001
From: Aleksei German <aleksei.german@qt.io>
Date: Fri, 7 Jun 2019 16:31:46 +0200
Subject: [PATCH] QmlDesigner ColorPalette StudioControls usage

Change-Id: Ia1c2daa693e9c2c2a2808cf6fab65a2b60014456
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../imports/HelperWidgets/SimpleColorPalette.qml      | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml
index c6b6acf2429..9cc787bd235 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml
@@ -25,6 +25,7 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 2.5
+import StudioControls 1.0 as StudioControls
 import HelperWidgets 2.0
 import QtQuick.Controls.Private 1.0 // showing a ToolTip
 
@@ -79,11 +80,9 @@ Item {
                         contextMenu.popup()
                 }
             }
-            Menu {
+            StudioControls.Menu {
                 id: contextMenu
-                modal: true
-                closePolicy: Popup.CloseOnPressOutside | Popup.CloseOnEscape
-                MenuItem {
+                StudioControls.MenuItem {
                     text: (backgroundColor.favorite
                            ? qsTr("Remove from Favorites")
                            : qsTr("Add to Favorites"))
@@ -91,10 +90,6 @@ Item {
                         paletteModel.toggleFavorite(index)
                     }
                 }
-
-                Overlay.modal: Rectangle {
-                    color: "transparent"
-                }
             }
         }
     }