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:
83498a9
)
substitute regular with normal style for compatibility in QFontDatabase::styles()
author
Ivailo Monev
<xakepa10@gmail.com>
Sun, 16 Jan 2022 13:47:26 +0000
(15:47 +0200)
committer
Ivailo Monev
<xakepa10@gmail.com>
Sun, 16 Jan 2022 13:47:26 +0000
(15:47 +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
dd9d82a
..
11fa5d2
100644
(file)
--- a/
src/gui/text/qfontdatabase.cpp
+++ b/
src/gui/text/qfontdatabase.cpp
@@
-414,7
+414,12
@@
QStringList QFontDatabase::styles(const QString &family) const
|| (!parsedfoundry.isEmpty() && fontfamily.foundry.compare(parsedfoundry, Qt::CaseInsensitive) != 0)) {
continue;
}
- result.append(fontfamily.style);
+ // compatibility
+ if (fontfamily.style.compare(QLatin1String("Regular"), Qt::CaseInsensitive) == 0) {
+ result.append(QLatin1String("Normal"));
+ } else {
+ result.append(fontfamily.style);
+ }
}
return result;
}