diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-31 12:25:48 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-27 14:42:59 +0200 |
| commit | da1b0d2d6a540e2a824bb0ac4154e0edaaf9ea45 (patch) | |
| tree | 6060109dcf6e97362250f4151cda79c07c4f8e38 /src/platformsupport/fontdatabases/mac | |
| parent | a64a0ce3317afa1ff633d1d08904c967dbc6ecad (diff) | |
Move FreeType font engine/database to QtGui
Task-number: QTBUG-83255
Change-Id: If6be7057d6bd25b34acd99e18658744161985ed0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/platformsupport/fontdatabases/mac')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/coretext.pri | 4 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri index 95b9926e65..31470ae583 100644 --- a/src/platformsupport/fontdatabases/mac/coretext.pri +++ b/src/platformsupport/fontdatabases/mac/coretext.pri @@ -13,3 +13,7 @@ else: \ LIBS_PRIVATE += -framework UIKit CONFIG += watchos_coretext + +qtConfig(freetype) { + QMAKE_USE_PRIVATE += freetype +} diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm index 664e532d7c..c0f1bd4d8d 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm @@ -57,7 +57,7 @@ #endif #include <QtCore/QtEndian> #ifndef QT_NO_FREETYPE -#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h> +#include <QtGui/private/qfontengine_ft_p.h> #endif QT_BEGIN_NAMESPACE |