diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-17 14:44:52 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-17 14:45:12 +0200 |
| commit | 267acc4587c91beafc0f8f3ea97c70801dc269f0 (patch) | |
| tree | a55e844e081b0e8d00803e5a1503dd520bd719be /src/controls/SpinBox.qml | |
| parent | fc40bf74c29a66f8af27b2fdb9d764f30814b983 (diff) | |
| parent | e417afed5835e6f9c3c6a623d778f581bc959d1c (diff) | |
| download | qtquickcontrols-267acc4587c91beafc0f8f3ea97c70801dc269f0.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/controls/Styles/Base/MenuStyle.qml
Change-Id: I95c8b4f348260b958f158ae28c0984d54af973a8
Diffstat (limited to 'src/controls/SpinBox.qml')
| -rw-r--r-- | src/controls/SpinBox.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index 9b6080f9..03a296f1 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -321,7 +321,7 @@ Control { height: upRect ? upRect.height : 0 onClicked: __increment() - onPressed: if (activeFocusOnPress) input.forceActiveFocus() + onPressed: if (!Settings.hasTouchScreen && activeFocusOnPress) input.forceActiveFocus() property bool autoincrement: false; onReleased: autoincrement = false @@ -337,7 +337,7 @@ Control { hoverEnabled: true onClicked: __decrement() - onPressed: if (activeFocusOnPress) input.forceActiveFocus() + onPressed: if (!Settings.hasTouchScreen && activeFocusOnPress) input.forceActiveFocus() property var downRect: __panel ? __panel.downRect : null |