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/SplitView.qml | |
| parent | a2f81b85d5dfa7fbd3b11557fe38de649a1f6914 (diff) | |
| parent | 9af9dabe3c88baa87befe5a4591d7f3508888307 (diff) | |
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/SplitView.qml')
| -rw-r--r-- | src/controls/SplitView.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml index 15db7350b..38b7f8391 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -449,7 +449,7 @@ Item { anchors.rightMargin: (parent.width <= 1) ? -defaultMargin : 0 anchors.topMargin: (parent.height <= 1) ? -defaultMargin : 0 anchors.bottomMargin: (parent.height <= 1) ? -defaultMargin : 0 - hoverEnabled: true + hoverEnabled: Private.Settings.hoverEnabled drag.threshold: 0 drag.target: parent drag.axis: root.orientation === Qt.Horizontal ? Drag.XAxis : Drag.YAxis |