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/windows/qwindowsintegration.cpp | |
| 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/windows/qwindowsintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 2d014a7c07..9503d48bdb 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -49,11 +49,12 @@ #include "qwindowstheme.h" #include "qwindowsservices.h" #ifdef QT_USE_DIRECTWRITE3 -#include <QtFontDatabaseSupport/private/qwindowsdirectwritefontdatabase_p.h> +#include <QtGui/private/qwindowsdirectwritefontdatabase_p.h> #endif #ifndef QT_NO_FREETYPE -# include <QtFontDatabaseSupport/private/qwindowsfontdatabase_ft_p.h> +# include <QtGui/private/qwindowsfontdatabase_ft_p.h> #endif +#include <QtGui/private/qwindowsfontdatabase_p.h> #if QT_CONFIG(clipboard) # include "qwindowsclipboard.h" # if QT_CONFIG(draganddrop) |