haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-24 17:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt, bump to version 6.10.3 (#13935)

Browse Source
This commit is contained in:
Schrijvers Luc
2026-04-13 14:15:19 +02:00
committed by GitHub
parent 9aadbc5e80
commit 6ea379be33
80 changed files with 174 additions and 5625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
dev-qt/qt6-base/patches/qt6_base-6.10.3-source2.patchset Normal file
View File

@@ -0,0 +1,57 @@
From 227d8f48538fa21d5d3f4b75951899081783ebde Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sat, 26 Apr 2025 10:50:40 +0200
Subject: Build fix
diff --git a/src/platform/qhaikuplatformfontdatabase.cpp b/src/platform/qhaikuplatformfontdatabase.cpp
index bdf8875..637427e 100644
--- a/src/platform/qhaikuplatformfontdatabase.cpp
+++ b/src/platform/qhaikuplatformfontdatabase.cpp
@@ -133,7 +133,7 @@ void QHaikuPlatformFontDatabase::populateFontDatabase()
QStringList QHaikuPlatformFontDatabase::fallbacksForFamily(const QString &family,
QFont::Style style,
QFont::StyleHint styleHint,
- QChar::Script script) const
+ QFontDatabasePrivate::ExtendedScript script) const
{
QStringList result;
if (styleHint == QFont::Monospace || styleHint == QFont::Courier) {
diff --git a/src/platform/qhaikuplatformfontdatabase.h b/src/platform/qhaikuplatformfontdatabase.h
index 6397903..0ddfd52 100644
--- a/src/platform/qhaikuplatformfontdatabase.h
+++ b/src/platform/qhaikuplatformfontdatabase.h
@@ -64,7 +64,7 @@ public:
QStringList fallbacksForFamily(const QString &family,
QFont::Style style,
QFont::StyleHint styleHint,
- QChar::Script script) const override;
+ QFontDatabasePrivate::ExtendedScript script) const override;
QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
void releaseHandle(void *handle) override;
private:
diff --git a/src/style/helper/qstylehelper.cpp b/src/style/helper/qstylehelper.cpp
index ea65227..0df07ef 100644
--- a/src/style/helper/qstylehelper.cpp
+++ b/src/style/helper/qstylehelper.cpp
@@ -287,7 +287,7 @@ void drawDial(const QStyleOptionSlider *option, QPainter *painter)
qMax(180, buttonColor.value()));
// Cache dial background
- BEGIN_STYLE_PIXMAPCACHE(QString::fromLatin1("qdial"));
+ QCachedPainter p(painter, QLatin1StringView("qdial"), option);
p->setRenderHint(QPainter::Antialiasing);
const qreal d_ = r / 6;
@@ -344,7 +344,7 @@ void drawDial(const QStyleOptionSlider *option, QPainter *painter)
p->drawEllipse(br.adjusted(-1, -1, 1, 1));
}
- END_STYLE_PIXMAPCACHE
+ p.finish();
QPointF dp = calcRadialPos(option, qreal(0.70));
buttonColor = buttonColor.lighter(104);
--
2.52.0