Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Chakra
Packages
core
Commits
d0d62f58
Commit
d0d62f58
authored
Mar 03, 2019
by
AlmAck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt5-quickcontrols patch for QTBUG-73691
https://bugreports.qt.io/browse/QTBUG-73691
parent
f19c06a0
Pipeline
#2804
passed with stages
in 4 minutes and 27 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
3 deletions
+37
-3
qt5-quickcontrols/PKGBUILD
qt5-quickcontrols/PKGBUILD
+8
-3
qt5-quickcontrols/qtbug-73961.patch
qt5-quickcontrols/qtbug-73961.patch
+29
-0
No files found.
qt5-quickcontrols/PKGBUILD
View file @
d0d62f58
pkgname
=
qt5-quickcontrols
pkgver
=
5.12.1
pkgrel
=
1
pkgrel
=
2
arch
=(
'x86_64'
)
url
=
'http://qt-project.org/'
license
=(
'GPL3'
'LGPL'
'FDL'
'custom'
)
...
...
@@ -11,11 +11,16 @@ makedepends=()
groups
=(
'qt5'
)
options
=(
'debug'
)
_pkgfqn
=
"
${
pkgname
/5-/
}
-everywhere-src-
${
pkgver
}
"
source
=(
"http://download.qt.io/official_releases/qt/
${
pkgver
%.*
}
/
$pkgver
/submodules/
${
_pkgfqn
}
.tar.xz"
)
md5sums
=(
'6ad05ee8458b72feeb03c856af40f198'
)
source
=(
"http://download.qt.io/official_releases/qt/
${
pkgver
%.*
}
/
$pkgver
/submodules/
${
_pkgfqn
}
.tar.xz"
qtbug-73961.patch
)
md5sums
=(
'6ad05ee8458b72feeb03c856af40f198'
'580a78ed7e35993a0a1ec5f6c6db6812'
)
prepare
()
{
mkdir
-p
build
cd
$_pkgfqn
patch
-p1
-i
../qtbug-73961.patch
# Fix OOM with some Plasma themes https://bugreports.qt.io/browse/QTBUG-73691
}
build
()
{
...
...
qt5-quickcontrols/qtbug-73961.patch
0 → 100644
View file @
d0d62f58
From e66dad9857cc062ccfc03e410b15ad1d0254dee9 Mon Sep 17 00:00:00 2001
From: Benjamin Robin <dev@benjarobin.fr>
Date: Sun, 24 Feb 2019 10:28:14 +0100
Subject: [PATCH] Fix ScrollView scrollbar handles when the content is empty
Task-number: QTBUG-73691
Change-Id: I86becca9a1fa2508d1acafe09f46dfc952e4e96d
---
src/controls/Styles/Base/ScrollViewStyle.qml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml
index 6750399d429..36b518d3933 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
--
2.20.1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment