diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-28 08:20:55 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-11 19:38:09 +0200 |
| commit | b3e0732740d8fdace82d91973dac87261402604f (patch) | |
| tree | b5e4e607959c2db78d972a43bd3640d0f29c0942 /src/plugins/platforms/direct2d | |
| parent | 84f279259713e60449ecf787babb6bdcadc16bea (diff) | |
Move windows font databases into QtGui
Requires adapting a few config checks since cmake currently
does not detect directwrite.
Task-number: QTBUG-83255
Task-number: QTBUG-83931
Change-Id: I521f1924f701260b41dccbcecf87b19f08df5ccc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/platforms/direct2d')
| -rw-r--r-- | src/plugins/platforms/direct2d/direct2d.pro | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro index cf41ffa116..1f8b41e7ec 100644 --- a/src/plugins/platforms/direct2d/direct2d.pro +++ b/src/plugins/platforms/direct2d/direct2d.pro @@ -1,8 +1,7 @@ TARGET = qdirect2d QT += \ - core-private gui-private \ - fontdatabase_support-private + core-private gui-private LIBS += -ldwmapi -lversion -ld3d11 -ldxgi -ldxguid QMAKE_USE_PRIVATE += gdi32 dwrite_1 d2d1_1 diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp index 0172004de6..4ce5825f95 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp @@ -45,8 +45,7 @@ #include "qwindowsdirect2dbitmap.h" #include "qwindowsdirect2ddevicecontext.h" -#include <QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h> -#include <QtFontDatabaseSupport/private/qwindowsfontengine_p.h> +#include <QtGui/private/qwindowsfontdatabase_p.h> #include "qwindowsintegration.h" #include <QtCore/qmath.h> |