diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-11-05 01:52:00 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-11-05 01:53:17 +0100 |
| commit | e79ceb97340699ed806aa021e1bda4b63fa6f3fe (patch) | |
| tree | 7e9ff3f64e026562eb76b523aa6be615d466598b /src/platformsupport | |
| parent | 825bb10d9bf40587828e4e589b199a9ffec255ce (diff) | |
| parent | a21ffd44b3a13a9ef64a56e67f6e267292f0a8e2 (diff) | |
Merge remote-tracking branch 'gerrit/5.8' into dev
Change-Id: Ib31cae9b57f6fb078739c409162bf2987eb430ad
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp | 4 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/windows/windows.pri | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp index f266e85126..6130107cc8 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp @@ -49,6 +49,7 @@ #include <QtCore/private/qsystemlibrary_p.h> #include <QtGui/private/qguiapplication_p.h> #include <qpa/qplatformintegration.h> +#include <QtGui/private/qhighdpiscaling_p.h> #if defined(QT_USE_DIRECTWRITE2) # include <dwrite_2.h> @@ -185,6 +186,9 @@ namespace { static DWRITE_RENDERING_MODE hintingPreferenceToRenderingMode(QFont::HintingPreference hintingPreference) { + if (QHighDpiScaling::isActive() && hintingPreference == QFont::PreferDefaultHinting) + hintingPreference = QFont::PreferVerticalHinting; + switch (hintingPreference) { case QFont::PreferNoHinting: return DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC; diff --git a/src/platformsupport/fontdatabases/windows/windows.pri b/src/platformsupport/fontdatabases/windows/windows.pri index 419c4dc6d9..4fc4e7b8ec 100644 --- a/src/platformsupport/fontdatabases/windows/windows.pri +++ b/src/platformsupport/fontdatabases/windows/windows.pri @@ -13,11 +13,6 @@ HEADERS += \ qtConfig(freetype) { SOURCES += $$PWD/qwindowsfontdatabase_ft.cpp HEADERS += $$PWD/qwindowsfontdatabase_ft_p.h - qtConfig(system-freetype) { - include($$QT_SOURCE_TREE/src/platformsupport/fontdatabases/basic/basic.pri) - } else { - include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri) - } } qtConfig(directwrite) { |