summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2014-06-20 11:35:27 +0200
committerAndy Shaw <andy.shaw@digia.com>2014-06-26 10:41:59 +0200
commitafd6313755399b24fb97e56f730f9898a0fa8f5a (patch)
treea04e47f2dd0f18605099fcd91988b939dd9e3a08 /src/plugins
parentc750d8408ed3d114a05412ed5c699d83bdc1b568 (diff)
Set fallback for QFont::System to be MS Sans Serif and not Arial
The system font for Windows should be MS Sans Serif which is what Qt 4 was using and not Arial. Change-Id: If3ed55bce87f6376b2897f1fc487bbc0627d1799 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/windows/qwindowsfontdatabase.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
index e4d60d6ec8..7058406b4a 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
@@ -1639,9 +1639,12 @@ QStringList QWindowsFontDatabase::fallbacksForFamily(const QString &family, QFon
result << QString::fromLatin1("Old English");
break;
case QFont::Helvetica:
+ result << QString::fromLatin1("Arial");
+ break;
case QFont::System:
default:
- result << QString::fromLatin1("Arial");
+ result << QString::fromLatin1("MS Sans Serif");
+ break;
}
result.append(QWindowsFontDatabase::extraTryFontsForFamily(family));