mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-06 11:41:52 +00:00
Code Issues Releases Activity

x11-toolkits/qt5-quickcontrols: fix regression in 5.12.1

Browse Source 
https://bugreports.qt.io/browse/QTBUG-73691
This commit is contained in:
Tobias C. Berner 2019-02-25 20:04:05 +00:00
parent 4a3dd00e1d
commit 74328c133b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=493895
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
x11-toolkits/qt5-quickcontrols/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= quickcontrols
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-

32
x11-toolkits/qt5-quickcontrols/files/patch-git_c23139 Normal file
View File

@ -0,0 +1,32 @@
From c231395eec3494619f4977b4c5cd845b9d7341ae Mon Sep 17 00:00:00 2001
From: Benjamin Robin <dev@benjarobin.fr>
Date: Sun, 24 Feb 2019 10:28:14 +0100
Subject: [PATCH] ScrollViewStyle: Avoid division by zero in extent computation
If the flickableItem content is empty (contentWidth / contentHeight is
equal to 0), prevent the division by zero in the computation of the
extent variable.
Task-number: QTBUG-73691
Change-Id: I86becca9a1fa2508d1acafe09f46dfc952e4e96d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
src/controls/Styles/Base/ScrollViewStyle.qml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git src/controls/Styles/Base/ScrollViewStyle.qml src/controls/Styles/Base/ScrollViewStyle.qml
index 6750399d..36b518d3 100644
--- src/controls/Styles/Base/ScrollViewStyle.qml
+++ 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
--