From b3e0732740d8fdace82d91973dac87261402604f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 28 May 2020 08:20:55 +0200 Subject: 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 --- src/plugins/platforms/direct2d/direct2d.pro | 3 +-- .../direct2d/qwindowsdirect2dpaintengine.cpp | 3 +-- src/plugins/platforms/minimal/.prev_CMakeLists.txt | 2 +- src/plugins/platforms/minimal/CMakeLists.txt | 2 +- src/plugins/platforms/minimal/minimal.pro | 2 +- src/plugins/platforms/minimal/qminimalintegration.cpp | 4 ++-- src/plugins/platforms/offscreen/.prev_CMakeLists.txt | 2 +- src/plugins/platforms/offscreen/CMakeLists.txt | 2 +- src/plugins/platforms/offscreen/offscreen.pro | 2 +- src/plugins/platforms/windows/.prev_CMakeLists.txt | 1 - src/plugins/platforms/windows/CMakeLists.txt | 1 - .../platforms/windows/qwindowsbackingstore.cpp | 2 +- src/plugins/platforms/windows/qwindowsintegration.cpp | 5 +++-- src/plugins/platforms/windows/qwindowsintegration.h | 2 +- .../platforms/windows/qwindowsnativeinterface.cpp | 2 +- src/plugins/platforms/windows/qwindowstheme.cpp | 19 ++++++++++++------- src/plugins/platforms/windows/windows.pro | 3 +-- 17 files changed, 29 insertions(+), 28 deletions(-) (limited to 'src/plugins') 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 -#include +#include #include "qwindowsintegration.h" #include diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index cdcdffa8e1..b5e165e2f1 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE +qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX AND NOT APPLE PUBLIC_LIBRARIES Qt::FontDatabaseSupportPrivate ) diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index 72c1090771..958204bcd8 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -29,7 +29,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE +qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX AND NOT APPLE PUBLIC_LIBRARIES Qt::FontDatabaseSupportPrivate ) diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index a644e65026..4eebd0f6ad 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -3,7 +3,7 @@ TARGET = qminimal QT += \ core-private gui-private -!darwin: QT += fontdatabase_support-private +!darwin:!win32: 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 16045d5e59..4a3b052200 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -47,9 +47,9 @@ #include #if defined(Q_OS_WIN) -# include +# include # if QT_CONFIG(freetype) -# include +# include # endif #elif defined(Q_OS_DARWIN) # include diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index a8643961d3..6ca250161f 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -27,7 +27,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE +qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX AND NOT APPLE PUBLIC_LIBRARIES Qt::FontDatabaseSupportPrivate ) diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index 59bfb19fc9..a798344238 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -28,7 +28,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE +qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX AND NOT APPLE PUBLIC_LIBRARIES Qt::FontDatabaseSupportPrivate ) diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro index 0d6faf08a4..4bdbf7224a 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -3,7 +3,7 @@ TARGET = qoffscreen QT += \ core-private gui-private -!darwin: QT += fontdatabase_support-private +!darwin:!win32: QT += fontdatabase_support-private DEFINES += QT_NO_FOREACH 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 #include -#include +#include #include #include 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 +#include #endif #ifndef QT_NO_FREETYPE -# include +# include #endif +#include #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 #include -#include +#include 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 #include #include -#include +#include 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 #include #include -#include +#include #include #include #include @@ -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 -- cgit v1.2.3