From 6135726f4a62fbf825a9aa33a527c5db5ee0b7d1 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Wed, 24 Jul 2019 12:28:35 +0200
Subject: [PATCH] QmlDesigner: Fix standalone ActionIndicator hover

Change-Id: I55dbcdffcd755ea16e3dcfb17683c27f3e77e49f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../imports/StudioControls/ActionIndicator.qml               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml
index 6e4f44ae73e..e261ebed677 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml
@@ -60,7 +60,8 @@ Rectangle {
             State {
                 name: "hovered"
                 when: actionIndicator.hover && !actionIndicator.pressed
-                      && !myControl.edit && !myControl.drag && myControl.enabled
+                      && (!myControl || (!myControl.edit && !myControl.drag))
+                      && actionIndicator.enabled
                 PropertyChanges {
                     target: actionIndicatorIcon
                     scale: 1.2
@@ -68,7 +69,7 @@ Rectangle {
             },
             State {
                 name: "disabled"
-                when: !myControl.enabled
+                when: !actionIndicator.enabled
                 PropertyChanges {
                     target: actionIndicatorIcon
                     color: StudioTheme.Values.themeTextColorDisabled