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 | |
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')
8 files changed, 19 insertions, 16 deletions
diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index 3c1568ad53..84219ddcd8 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -50,7 +50,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin PUBLIC_LIBRARIES Qt::Core Qt::CorePrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate dwmapi diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 823ba613a3..9674710d54 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -51,7 +51,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin PUBLIC_LIBRARIES Qt::Core Qt::CorePrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate dwmapi diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.cpp b/src/plugins/platforms/windows/qwindowsbackingstore.cpp index e3939ca2d7..e9d1915201 100644 --- a/src/plugins/platforms/windows/qwindowsbackingstore.cpp +++ b/src/plugins/platforms/windows/qwindowsbackingstore.cpp @@ -43,7 +43,7 @@ #include <QtGui/qwindow.h> #include <QtGui/qpainter.h> -#include <QtFontDatabaseSupport/private/qwindowsnativeimage_p.h> +#include <QtGui/private/qwindowsnativeimage_p.h> #include <private/qhighdpiscaling_p.h> #include <private/qimage_p.h> 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) diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index 64cbda7c58..3c3763745c 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/src/plugins/platforms/windows/qwindowsintegration.h @@ -43,7 +43,7 @@ #include <qpa/qplatformintegration.h> #include <QtCore/qscopedpointer.h> -#include <QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h> +#include <QtGui/private/qwindowsfontdatabase_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp index 0cd361516e..efd7d04b3e 100644 --- a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp +++ b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp @@ -54,7 +54,7 @@ #include <QtGui/qopenglcontext.h> #include <QtGui/qscreen.h> #include <qpa/qplatformscreen.h> -#include <QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h> +#include <QtGui/private/qwindowsfontdatabase_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp index 36831bdd81..1f4c851742 100644 --- a/src/plugins/platforms/windows/qwindowstheme.cpp +++ b/src/plugins/platforms/windows/qwindowstheme.cpp @@ -77,7 +77,7 @@ #include <QtGui/qpixmapcache.h> #include <qpa/qwindowsysteminterface.h> #include <QtGui/private/qabstractfileiconengine_p.h> -#include <QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h> +#include <QtGui/private/qwindowsfontdatabase_p.h> #include <private/qhighdpiscaling_p.h> #include <private/qsystemlibrary_p.h> #include <private/qwinregistry_p.h> @@ -566,18 +566,23 @@ void QWindowsTheme::refresh() } #ifndef QT_NO_DEBUG_STREAM -QDebug operator<<(QDebug d, const LOGFONT &lf); // in platformsupport - QDebug operator<<(QDebug d, const NONCLIENTMETRICS &m) { QDebugStateSaver saver(d); d.nospace(); d.noquote(); d << "NONCLIENTMETRICS(iMenu=" << m.iMenuWidth << 'x' << m.iMenuHeight - << ", lfCaptionFont=" << m.lfCaptionFont << ", lfSmCaptionFont=" - << m.lfSmCaptionFont << ", lfMenuFont=" << m.lfMenuFont - << ", lfMessageFont=" << m.lfMessageFont << ", lfStatusFont=" - << m.lfStatusFont << ')'; + << ", lfCaptionFont="; + QWindowsFontDatabase::debugFormat(d, m.lfCaptionFont); + d << ", lfSmCaptionFont="; + QWindowsFontDatabase::debugFormat(d, m.lfSmCaptionFont); + d << ", lfMenuFont="; + QWindowsFontDatabase::debugFormat(d, m.lfMenuFont); + d << ", lfMessageFont="; + QWindowsFontDatabase::debugFormat(d, m.lfMessageFont); + d <<", lfStatusFont="; + QWindowsFontDatabase::debugFormat(d, m.lfStatusFont); + d << ')'; return d; } #endif // QT_NO_DEBUG_STREAM diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 258ffb0c0d..39a07e6361 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -1,8 +1,7 @@ TARGET = qwindows QT += \ - core-private gui-private \ - fontdatabase_support-private + core-private gui-private qtConfig(opengl): QT += opengl-private |