diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:04:58 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:04:58 +0100 |
| commit | 71314570d03631f50ab2c262011aba6a572d0ced (patch) | |
| tree | 6d0c663ad313af89efff8e7b0fdafe6a28b19505 /src/controls/Private/ScrollBar.qml | |
| parent | 3704a616dfabb71ebd3ffc64f8efe32931c82a8b (diff) | |
| parent | ea099e341b5f8845be56f81b22e44a8b6cb227a2 (diff) | |
| download | qtquickcontrols-71314570d03631f50ab2c262011aba6a572d0ced.tar.gz | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I4c81a7852e7041328b7cfa320e907cc3cb863f04
Diffstat (limited to 'src/controls/Private/ScrollBar.qml')
| -rw-r--r-- | src/controls/Private/ScrollBar.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml index 82750412..3bd0a164 100644 --- a/src/controls/Private/ScrollBar.qml +++ b/src/controls/Private/ScrollBar.qml @@ -102,7 +102,7 @@ Item { onExited: if (!pressed) __panel.activeControl = "none" onMouseXChanged: if (!pressed) __panel.activeControl = __panel.hitTest(mouseX, mouseY) hoverEnabled: !Settings.hasTouchScreen - enabled: !Settings.hasTouchScreen // TODO: touch on desktop? + enabled: !Settings.isMobile || !Settings.hasTouchScreen // ### Not ideal, but will usually behave as expected... preventStealing: true property var pressedX property var pressedY |