Commit 55e3f891 authored by Chaoting Liu's avatar Chaoting Liu

[against stable] qt5-base: various upstream bugfix

parent 23ff2951
......@@ -3,7 +3,7 @@ source ../qt5.conf
pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
pkgver=${QSubVersion}
pkgrel=1
pkgrel=2
arch=('x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL3' 'FDL' 'custom')
......@@ -22,9 +22,19 @@ optdepends=('qt5-svg: to use SVG icon themes'
groups=('qt5')
options=('debug')
source=( $(getSrc ${pkgname})
qt-no-statx.patch)
qt-no-statx.patch
qtbug-65478.patch
qheaderview-restore.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4a04eea4"
qtbug-66444.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=9395f35c"
qtbug-66420.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fa091640"
qtbug-66816.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=e4e87a2e")
md5sums=($(getSum ${pkgname})
'35cc4abc5f125905645e09bf37e5a3b0')
'35cc4abc5f125905645e09bf37e5a3b0'
'e5bbb67fffe0bcc48e921ca567a3eec6'
'0afbecdd84674d8e362102f6756e8859'
'45095820d2517e3c45c456663a52beb1'
'922d3d4d6a49bf03acfab49031edd8b3'
'49e505b771ffbd389998d0065a7f63c9')
prepare() {
cd $(getPkgName ${pkgname})
......@@ -45,6 +55,17 @@ prepare() {
# Don't use the statx syscall https://bugs.archlinux.org/task/56289 https://bugreports.qt.io/browse/QTBUG-64490
patch -p1 -i ../qt-no-statx.patch
# Fix kexi crash at startup http://bugreports.qt.io/browse/QTBUG-65478
patch -p1 -i ../qtbug-65478.patch
# Fix restoring column status in kmail and ksysguard
patch -p1 -i ../qheaderview-restore.patch
# Fix QHeaderView regression https://bugreports.qt.io/browse/QTBUG-66444
patch -p1 -i ../qtbug-66444.patch
# Fix white screen with Mesa 18 https://bugreports.qt.io/browse/QTBUG-66420
patch -p1 -i ../qtbug-66420.patch
# Fix crashes in QSqlite http://bugreports.qt.io/browse/QTBUG-66816
patch -p1 -i ../qtbug-66816.patch
}
build() {
......
From e8425f9e52c9df0ce0fbf122adff3ef6930f9961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lund=20Martsum?= <tmartsum@gmail.com>
Date: Wed, 28 Feb 2018 09:23:54 +0100
Subject: QHeaderView: Fix crash in layout about to change
Before there was a risk looking up e.g index -1 if there
were no visible sections in layoutAboutToChange.
Change-Id: Ic911e4292e8e8c4892fef1c0f34cf7dccaad2bac
Task-number: QTBUG-65478
Reviewed-by: David Faure <david.faure@kdab.com>
---
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index 26d7c5472a..708b9b44ca 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -2163,9 +2163,11 @@ void QHeaderViewPrivate::_q_sectionsAboutToBeChanged()
layoutChangePersistentSections.clear();
layoutChangePersistentSections.reserve(std::min(10, sectionItems.count()));
// after layoutChanged another section can be last stretched section
- if (stretchLastSection) {
+ if (stretchLastSection && lastSectionLogicalIdx >= 0 && lastSectionLogicalIdx < sectionItems.count()) {
const int visual = visualIndex(lastSectionLogicalIdx);
- sectionItems[visual].size = lastSectionSize;
+ if (visual >= 0 && visual < sectionItems.size()) {
+ sectionItems[visual].size = lastSectionSize;
+ }
}
for (int i = 0; i < sectionItems.size(); ++i) {
auto s = sectionItems.at(i);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment