OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c6f138
)
do not attempt to resolve font family alias if fontconfig is disabled
author
Ivailo Monev
<xakepa10@gmail.com>
Sun, 16 Jan 2022 14:50:28 +0000
(16:50 +0200)
committer
Ivailo Monev
<xakepa10@gmail.com>
Sun, 16 Jan 2022 14:50:28 +0000
(16:50 +0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/gui/text/qfontdatabase.cpp
patch
|
blob
|
history
diff --git
a/src/gui/text/qfontdatabase.cpp
b/src/gui/text/qfontdatabase.cpp
index
2f402f1
..
4122ad0
100644
(file)
--- a/
src/gui/text/qfontdatabase.cpp
+++ b/
src/gui/text/qfontdatabase.cpp
@@
-168,6
+168,9
@@
QString QFontDatabase::resolveFontFamilyAlias(const QString &family)
#if defined(QT_NO_FONTCONFIG)
return family;
#else
+ if (!qt_x11Data->has_fontconfig)
+ return family;
+
FcPattern *pattern = FcPatternCreate();
if (!pattern)
return family;