summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.12.1020
-rw-r--r--dist/changes-5.12.520
-rw-r--r--dist/changes-5.12.624
-rw-r--r--dist/changes-5.12.720
-rw-r--r--dist/changes-5.12.820
-rw-r--r--dist/changes-5.12.920
-rw-r--r--src/controls/Private/BasicTableView.qml2
-rw-r--r--tests/auto/extras/data/tst_tumbler.qml35
9 files changed, 126 insertions, 37 deletions
diff --git a/.qmake.conf b/.qmake.conf
index bc353b73..f1dfbb7f 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
CONFIG += warning_clean
android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop
-MODULE_VERSION = 5.12.4
+MODULE_VERSION = 5.12.12
diff --git a/dist/changes-5.12.10 b/dist/changes-5.12.10
new file mode 100644
index 00000000..a2be5e73
--- /dev/null
+++ b/dist/changes-5.12.10
@@ -0,0 +1,20 @@
+Qt 5.12.10 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.9.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ https://doc.qt.io/qt-5.12/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.
+
+- This release contains only minor code improvements.
diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5
new file mode 100644
index 00000000..e8be9316
--- /dev/null
+++ b/dist/changes-5.12.5
@@ -0,0 +1,20 @@
+Qt 5.12.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.4.
+
+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.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.12.6 b/dist/changes-5.12.6
new file mode 100644
index 00000000..340bbaeb
--- /dev/null
+++ b/dist/changes-5.12.6
@@ -0,0 +1,24 @@
+Qt 5.12.6 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.5.
+
+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.
+
+****************************************************************************
+* Controls *
+****************************************************************************
+
+ - [QTBUG-72543] Fixed TreeView model size error.
diff --git a/dist/changes-5.12.7 b/dist/changes-5.12.7
new file mode 100644
index 00000000..c9716139
--- /dev/null
+++ b/dist/changes-5.12.7
@@ -0,0 +1,20 @@
+Qt 5.12.7 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.6.
+
+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.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.12.8 b/dist/changes-5.12.8
new file mode 100644
index 00000000..729d7404
--- /dev/null
+++ b/dist/changes-5.12.8
@@ -0,0 +1,20 @@
+Qt 5.12.8 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.7.
+
+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.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.12.9 b/dist/changes-5.12.9
new file mode 100644
index 00000000..d3d50ba6
--- /dev/null
+++ b/dist/changes-5.12.9
@@ -0,0 +1,20 @@
+Qt 5.12.9 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.8.
+
+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.
+
+ - This release contains only minor code improvements.
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml
index 37ecabbf..d99cb0b0 100644
--- a/src/controls/Private/BasicTableView.qml
+++ b/src/controls/Private/BasicTableView.qml
@@ -493,7 +493,7 @@ ScrollView {
y: listView.contentHeight - listView.contentY + listView.originY
width: parent.width
visible: alternatingRowColors
- height: viewport.height - listView.contentHeight
+ height: listView.model && listView.model.count ? (viewport.height - listView.contentHeight) : 0
Repeater {
model: visible ? parent.paddedRowCount : 0
Loader {
diff --git a/tests/auto/extras/data/tst_tumbler.qml b/tests/auto/extras/data/tst_tumbler.qml
index 5585b5db..6f207b4b 100644
--- a/tests/auto/extras/data/tst_tumbler.qml
+++ b/tests/auto/extras/data/tst_tumbler.qml
@@ -326,41 +326,6 @@ Item {
verify(secondItem.y < thirdItem.y);
}
- property Component oneHundredItemColumn: TumblerColumn {
- model: ListModel {
- Component.onCompleted: {
- for (var i = 0; i < 100; ++i) {
- append({value: i.toString()});
- }
- }
- }
- }
-
- function test_resizeAfterFlicking() {
- var tumbler = createTemporaryObject(tumblerComponent, container);
- verify(tumbler);
-
- // Test QTBUG-40367 (which is actually invalid because it was my fault :)).
- var column = oneHundredItemColumn.createObject(tumbler);
- compare(tumbler.addColumn(column), column);
- waitForRendering(tumbler);
-
- // Flick in some direction.
- var pos = Qt.point(columnXCenter(tumbler, 0), tumbler.__style.padding.top);
- mouseDrag(tumbler, pos.x, pos.y, 0, tumbler.height - tumbler.__style.padding.bottom,
- Qt.LeftButton, Qt.NoModifier, 300);
- tryCompare(tumbler.__viewAt(0), "offset", Settings.styleName === "Flat" ? 6.0 : 4.0);
-
- tumbler.height += 100;
- var padding = tumbler.__style.padding;
- compare(tumbler.__style.__delegateHeight,
- (tumbler.height - padding.top - padding.bottom) / tumbler.__style.visibleItemCount);
- waitForRendering(tumbler);
- pos = itemCenterPos(tumbler, 0, 1);
- var ninetyEighthItem = tumbler.__viewAt(0).itemAt(pos.x, pos.y);
- verify(ninetyEighthItem);
- }
-
property Component dayOfMonthColumn: TumblerColumn {
model: ListModel {
Component.onCompleted: {