diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-31 12:25:59 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-27 17:51:24 +0200 |
| commit | ce2bc0e2d5b1d647db1e1726ecd434cc8a55accf (patch) | |
| tree | 004e90f6cb9a79e76f82d248a3eb8951e6095161 /src/plugins/platforms/minimal | |
| parent | cbb9c53704dca4fdaba75e1e1fd354cff058876b (diff) | |
Move CoreText font engine/database to QtGui
Task-number: QTBUG-83255
Change-Id: Id34ed1759fdebbb1d09e51009f0370736002167c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforms/minimal')
| -rw-r--r-- | src/plugins/platforms/minimal/minimal.pro | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index a1a2da547b..eaa5deb721 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -2,7 +2,9 @@ TARGET = qminimal QT += \ core-private gui-private \ - eventdispatcher_support-private fontdatabase_support-private + eventdispatcher_support-private + +!darwin: QT += fontdatabase_support-private DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index b1f07f0ac2..bfdcda1a84 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -54,7 +54,7 @@ # include <QtFontDatabaseSupport/private/qwindowsfontdatabase_ft_p.h> # endif #elif defined(Q_OS_DARWIN) -# include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h> +# include <QtGui/private/qcoretextfontdatabase_p.h> #endif #if QT_CONFIG(fontconfig) |