5770a645a3
This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 There is no 5.15.8 release of the kde-maintained modules, no release tarballs and no tags. Instead, there's just a rolling maintenance branch. We take a snapshot of that branch and call it 5.15.8, to match the latest qt5webengine release. We need to remove some patches applied upstream already. qt5location has mapboxgl as a submodule, which is not included in the gitlab-generated tarball. Therefore, use the git download method with submodules enabled. We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version. We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream. Instead of calling syncqt.pl, update the MODULE_VERSION in .qmake.conf to 5.15.8 and create a .git file so to trigger headers sync during configure. Hold back updating qt5webengine for now since the latest version requires significant changes to build, just tweak existing version to be compatible with latest kde versions for now. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Reviewed-by: Adam Duskett <aduskett@gmail.com> Tested-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001
|
|
From: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|
Date: Fri, 23 Jul 2021 15:53:56 +0200
|
|
Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Some pathological cases were not caught by the previous fix.
|
|
|
|
Fixes: QTBUG-95239
|
|
Pick-to: 6.2 6.1 5.15
|
|
Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5
|
|
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
|
|
(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c)
|
|
[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce]
|
|
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
|
|
---
|
|
src/gui/painting/qpaintengineex.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
|
|
index 55fdb0c2a0..19e4b23423 100644
|
|
--- a/src/gui/painting/qpaintengineex.cpp
|
|
+++ b/src/gui/painting/qpaintengineex.cpp
|
|
@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen)
|
|
patternLength *= pen.widthF();
|
|
if (qFuzzyIsNull(patternLength)) {
|
|
pen.setStyle(Qt::NoPen);
|
|
- } else if (extent / patternLength > 10000) {
|
|
+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) {
|
|
// approximate stream of tiny dashes with semi-transparent solid line
|
|
pen.setStyle(Qt::SolidLine);
|
|
QColor color(pen.color());
|
|
--
|
|
2.34.1
|
|
|