From 8c55089207fa2381f24cf7e718a519c078a1338e Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Tue, 6 Apr 2021 12:05:45 +0300 Subject: Fix warning with QML FileDialog with many files Fixes: QTBUG-92444 Change-Id: I3920fa1da087752049b5c83b23995b2e88e3ca96 Reviewed-by: Andy Shaw Reviewed-by: Mitch Curtis --- src/controls/Private/BasicTableView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index d38c0694..1422c87a 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -491,7 +491,7 @@ ScrollView { y: listView.contentHeight - listView.contentY + listView.originY width: parent.width visible: alternatingRowColors - height: listView.model && listView.model.count ? (viewport.height - listView.contentHeight) : 0 + height: listView.model && listView.model.count ? Math.max(viewport.height - listView.contentHeight, 0) : 0 Repeater { model: visible ? parent.paddedRowCount : 0 Loader { -- cgit v1.2.1 From 2cf4b3fdba3330420055010fa9c2199b5a9831ab Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 20 May 2021 14:47:54 +0300 Subject: Bump version Change-Id: I74de151d01657170ce90e9f388c59cb3f535aaf2 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 909006ff..126ddb1c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.4 +MODULE_VERSION = 5.15.5 -- cgit v1.2.1