diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:17:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-08-28 16:17:05 +0200 |
| commit | 1c9bf2e4641ba1fe8e6d8ba3da0d783e11ae56f6 (patch) | |
| tree | 7acb42c1c65868a3befa256cf117b6cacb942546 /src/controls/Styles/Android/ToolButtonStyle.qml | |
| parent | 10f0da6cfb56396a16ec741380556320fba86552 (diff) | |
| parent | 042cd5a6d88685d57e8828e4aca55e48feeb9bf7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/controls/Styles/Android/ToolButtonStyle.qml')
| -rw-r--r-- | src/controls/Styles/Android/ToolButtonStyle.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/Styles/Android/ToolButtonStyle.qml b/src/controls/Styles/Android/ToolButtonStyle.qml index 3d415a4b9..33d922207 100644 --- a/src/controls/Styles/Android/ToolButtonStyle.qml +++ b/src/controls/Styles/Android/ToolButtonStyle.qml @@ -72,7 +72,7 @@ Style { pressed: control.pressed checked: control.checked focused: control.activeFocus - window_focused: control.window && control.window.active + window_focused: control.Window.active styleDef: panel.styleDef.View_background } @@ -99,7 +99,7 @@ Style { pressed: control.pressed focused: control.activeFocus selected: control.checked - window_focused: control.window && control.window.active + window_focused: control.Window.active styleDef: panel.styleDef Layout.fillWidth: true } @@ -110,7 +110,7 @@ Style { pressed: control.pressed checked: control.checked focused: control.activeFocus - window_focused: control.window && control.window.active + window_focused: control.Window.active styleDef: AndroidStyle.styleDef.actionOverflowButtonStyle.ImageView_src Layout.alignment: Qt.AlignCenter } |