summaryrefslogtreecommitdiff
path: root/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-10 13:08:05 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-11 09:25:42 +0200
commit5909e6d0d10de3e1370b3ea0bc596f580101e3b4 (patch)
tree6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
parentbeaeeb99881184fd368c121fcbb1a31c78b794a3 (diff)
parent81cbb264cb9446c4408124d50aeff50164ad0ab4 (diff)
downloadqtwebkit-5909e6d0d10de3e1370b3ea0bc596f580101e3b4.tar.gz
Merge "Merge remote-tracking branch 'origin/5.212' into dev"
Diffstat (limited to 'Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp')
-rw-r--r--Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp b/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
index 2ed4a98c3..8727bccab 100644
--- a/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp
@@ -105,7 +105,9 @@ FontPlatformData::FontPlatformData(const FontDescription& description, const Ato
font.setLetterSpacing(QFont::AbsoluteSpacing, letterSpacing);
if (!FontCascade::shouldUseSmoothing())
- font.setStyleStrategy(QFont::NoAntialias);
+ font.setStyleStrategy(static_cast<QFont::StyleStrategy>(QFont::NoAntialias | QFont::ForceOutline));
+ else
+ font.setStyleStrategy(QFont::ForceOutline);
m_data->bold = font.bold();
// WebKit allows font size zero but QFont does not. We will return