diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:08:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:08:16 +0100 |
| commit | 652e3bfcefab674be3caa5062f4d1cf9634b9ef2 (patch) | |
| tree | 539292ea832874f4e7a5efc39cb284b52d85f5c4 | |
| parent | ff2c10d287aa9f9726ceee91543f08ab1f9d0b9c (diff) | |
| parent | 8a223fc04e003d93c63dc3c1786da115dd70c7bd (diff) | |
| download | qtquickcontrols-652e3bfcefab674be3caa5062f4d1cf9634b9ef2.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I64e4c4f9ca56b263d8f00d3ba6a1067d78f26065
| -rw-r--r-- | src/controls/Styles/Base/ScrollViewStyle.qml | 4 | ||||
| -rw-r--r-- | src/controls/Styles/Desktop/GroupBoxStyle.qml | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml index da1930ea..3df278c6 100644 --- a/src/controls/Styles/Base/ScrollViewStyle.qml +++ b/src/controls/Styles/Base/ScrollViewStyle.qml @@ -370,8 +370,8 @@ Style { property var flickableItem: control.flickableItem property int extent: Math.max(minimumHandleLength, __styleData.horizontal ? - (flickableItem ? flickableItem.width/flickableItem.contentWidth : 0 ) * bg.width : - (flickableItem ? flickableItem.height/flickableItem.contentHeight : 0) * bg.height) + Math.min(1, (flickableItem ? flickableItem.width/flickableItem.contentWidth : 0)) * bg.width : + Math.min(1, (flickableItem ? flickableItem.height/flickableItem.contentHeight : 0)) * bg.height) readonly property real range: __control.maximumValue - __control.minimumValue readonly property real begin: __control.value - __control.minimumValue diff --git a/src/controls/Styles/Desktop/GroupBoxStyle.qml b/src/controls/Styles/Desktop/GroupBoxStyle.qml index 22a15ad1..b3128933 100644 --- a/src/controls/Styles/Desktop/GroupBoxStyle.qml +++ b/src/controls/Styles/Desktop/GroupBoxStyle.qml @@ -70,7 +70,6 @@ Style { hasFocus: control.__checkbox.activeFocus activeControl: control.checkable ? "checkbox" : "" properties: { "checkable" : control.checkable , "sunken" : !control.flat} - textureHeight: 128 border {top: 32 ; bottom: 8} Accessible.role: Accessible.Grouping } |