diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-12 15:53:02 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-12 15:53:02 +0100 |
| commit | 1a5413df3d9a0602f074562e2e92751df369d016 (patch) | |
| tree | 461a56ee176e873bee441fe4d899d7a683deca9d /src/controls/SpinBox.qml | |
| parent | a2f81b85d5dfa7fbd3b11557fe38de649a1f6914 (diff) | |
| parent | 9af9dabe3c88baa87befe5a4591d7f3508888307 (diff) | |
| download | qtquickcontrols-1a5413df3d9a0602f074562e2e92751df369d016.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/controls/TableView.qml
tests/auto/controls/data/tst_gridlayout.qml
Change-Id: I030bc50dc8fcf7b6b00e183dc3a67c3cd012f3fb
Diffstat (limited to 'src/controls/SpinBox.qml')
| -rw-r--r-- | src/controls/SpinBox.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index 39caae50..95ce2b47 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -267,7 +267,7 @@ Control { MouseArea { id: mouseArea anchors.fill: parent - hoverEnabled: true + hoverEnabled: Settings.hoverEnabled onPressed: if (activeFocusOnPress) input.forceActiveFocus() onWheel: { if (wheel.angleDelta.y > 0) @@ -330,7 +330,7 @@ Control { MouseArea { id: mouseUp objectName: "mouseUp" - hoverEnabled: true + hoverEnabled: Settings.hoverEnabled property var upRect: __panel ? __panel.upRect : null @@ -357,7 +357,7 @@ Control { MouseArea { id: mouseDown objectName: "mouseDown" - hoverEnabled: true + hoverEnabled: Settings.hoverEnabled onClicked: __decrement() onPressed: if (!Settings.hasTouchScreen && activeFocusOnPress) input.forceActiveFocus() |