diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 11:05:54 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 11:05:54 +0100 |
| commit | d601a02c236314a023d5cea53d17747df6a9d84b (patch) | |
| tree | a60986e35d1e5cd4874b4c7c014c07c5a05baa5b | |
| parent | 46425199ebcdd4cb9facb471f67e17a941ca103f (diff) | |
| parent | c231395eec3494619f4977b4c5cd845b9d7341ae (diff) | |
Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: I8816a9d3e27cf79950b94fefd3bce86923c125c5
| -rw-r--r-- | dist/changes-5.12.2 | 30 | ||||
| -rw-r--r-- | src/controls/Styles/Base/ScrollViewStyle.qml | 4 |
2 files changed, 32 insertions, 2 deletions
diff --git a/dist/changes-5.12.2 b/dist/changes-5.12.2 new file mode 100644 index 000000000..9a4e2ce8b --- /dev/null +++ b/dist/changes-5.12.2 @@ -0,0 +1,30 @@ +Qt 5.12.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.1. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + - [QTBUG-73765] Fixed Calendar's day of week header not being updated when + the locale is changed. + - [QTBUG-65209] Fixed progress indicator with vertical ProgessBar. + - [QTBUG-69041] Fixed TableView's vertical scrollbar being drawn over the + header. + - [QTBUG-71997] Fixed time component of minimumDate and maximumDate + affecting valid range of dates. diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml index 6750399d4..36b518d39 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 ? - Math.min(1, (flickableItem ? flickableItem.width/flickableItem.contentWidth : 1)) * bg.width : - Math.min(1, (flickableItem ? flickableItem.height/flickableItem.contentHeight : 1)) * bg.height) + Math.min(1, ((flickableItem && flickableItem.contentWidth > 0.0) ? flickableItem.width/flickableItem.contentWidth : 1)) * bg.width : + Math.min(1, ((flickableItem && flickableItem.contentHeight > 0.0) ? flickableItem.height/flickableItem.contentHeight : 1)) * bg.height) readonly property real range: __control.maximumValue - __control.minimumValue readonly property real begin: __control.value - __control.minimumValue |