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/ScrollViewStyle.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/ScrollViewStyle.qml')
| -rw-r--r-- | src/controls/Styles/Android/ScrollViewStyle.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Styles/Android/ScrollViewStyle.qml b/src/controls/Styles/Android/ScrollViewStyle.qml index 0105b9cb4..3a0267591 100644 --- a/src/controls/Styles/Android/ScrollViewStyle.qml +++ b/src/controls/Styles/Android/ScrollViewStyle.qml @@ -73,7 +73,7 @@ ScrollViewStyle { styleDef: styleData.horizontal ? AndroidStyle.styleDef.scrollViewStyle.View_scrollbarTrackHorizontal : AndroidStyle.styleDef.scrollViewStyle.View_scrollbarTrackVertical focused: control.activeFocus - window_focused: control.window && control.window.active + window_focused: control.Window.active } } @@ -82,6 +82,6 @@ ScrollViewStyle { : AndroidStyle.styleDef.scrollViewStyle.View_scrollbarThumbVertical pressed: styleData.pressed focused: control.activeFocus - window_focused: control.window && control.window.active + window_focused: control.Window.active } } |