summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-30 03:03:29 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-30 03:03:29 +0100
commit56527b2f9efb59c4d7f90e3b50be957a15b20271 (patch)
tree9663e05b3bcd8b759f733d008e70628e271e7e04
parentda824463ba84d64ee4918feb2cf0e83d835f4404 (diff)
parent4bfe4b892cbbe1f1936d7caa0aac603258abc5df (diff)
downloadqtquickcontrols-56527b2f9efb59c4d7f90e3b50be957a15b20271.tar.gz
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I67c7f85c6743ee035e6e9051b3a5d402616eb964
-rw-r--r--dist/changes-5.12.230
-rw-r--r--src/controls/Styles/Base/ScrollViewStyle.qml4
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 00000000..9a4e2ce8
--- /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 6750399d..36b518d3 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