mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-24 17:18:51 +02:00
58 lines
2.3 KiB
Plaintext
58 lines
2.3 KiB
Plaintext
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
|
|
|