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/qwindowstheme.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/qwindowstheme.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowstheme.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
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 |