diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-12 07:38:54 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-15 11:34:26 +0200 |
commit | 6be9830d865be32f224e15d13ddefd9c7e176553 (patch) | |
tree | 8938ff202f53f3ad0f4e8facee84f0acdf9af093 /src | |
parent | 927a82f5e0d0e8a174cbb027c58412e13f7067c5 (diff) |
Move Unix font databases into QtGui
Task-number: QTBUG-83255
Change-Id: Id85a1e0f3de371951783fe97485158c4a02e1f15
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
58 files changed, 81 insertions, 198 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index dba7b9d3cb..1233dcf21c 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -550,6 +550,19 @@ qt_extend_target(Gui CONDITION QT_FEATURE_freetype WrapFreetype::WrapFreetype ) +qt_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE + SOURCES + text/unix/qgenericunixfontdatabase_p.h +) + +qt_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE + SOURCES + text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h + text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h + LIBRARIES + Fontconfig::Fontconfig +) + qt_extend_target(Gui CONDITION APPLE AND NOT MACOS LIBRARIES ${FWUIKit} @@ -671,7 +684,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan Vulkan::Vulkan_nolink ) -#### Keys ignored in scope 99:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: +#### Keys ignored in scope 102:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl" # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml" # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL" @@ -687,10 +700,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 100:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 103:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 101:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 104:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index c38129c028..7c1d0bbe42 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -658,6 +658,19 @@ qt_extend_target(Gui CONDITION QT_FEATURE_freetype WrapFreetype::WrapFreetype ) +qt_extend_target(Gui CONDITION QT_FEATURE_freetype AND UNIX AND NOT APPLE + SOURCES + text/unix/qgenericunixfontdatabase_p.h +) + +qt_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_freetype AND UNIX AND NOT APPLE + SOURCES + text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h + text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h + LIBRARIES + Fontconfig::Fontconfig +) + qt_extend_target(Gui CONDITION APPLE AND NOT MACOS LIBRARIES ${FWUIKit} @@ -835,10 +848,10 @@ add_custom_command( # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 100:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 103:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 101:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 104:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 8c36dce6b6..fd41b1661b 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -126,6 +126,9 @@ qtConfig(cssparser) { qtConfig(freetype) { include($$PWD/freetype/freetype.pri) + unix:!darwin { + include($$PWD/unix/unix.pri) + } } darwin { @@ -135,4 +138,3 @@ darwin { win32 { include($$PWD/windows/windows.pri) } - diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp index c6b0485ec5..c6b0485ec5 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/gui/text/unix/qfontconfigdatabase.cpp diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h b/src/gui/text/unix/qfontconfigdatabase_p.h index 58f549d114..cce2bac1d3 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h +++ b/src/gui/text/unix/qfontconfigdatabase_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class QFontEngineFT; -class QFontconfigDatabase : public QFreeTypeFontDatabase +class Q_GUI_EXPORT QFontconfigDatabase : public QFreeTypeFontDatabase { public: void populateFontDatabase() override; diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp b/src/gui/text/unix/qfontenginemultifontconfig.cpp index 01d58022f2..01d58022f2 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp +++ b/src/gui/text/unix/qfontenginemultifontconfig.cpp diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h b/src/gui/text/unix/qfontenginemultifontconfig_p.h index 7f560c2d05..7f350aecb7 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h +++ b/src/gui/text/unix/qfontenginemultifontconfig_p.h @@ -44,8 +44,8 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to // version without notice, or even be removed. // // We mean it. @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -class QFontEngineMultiFontConfig : public QFontEngineMulti +class Q_GUI_EXPORT QFontEngineMultiFontConfig : public QFontEngineMulti { public: explicit QFontEngineMultiFontConfig(QFontEngine *fe, int script); diff --git a/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h b/src/gui/text/unix/qgenericunixfontdatabase_p.h index c5be0e7345..21c57c303e 100644 --- a/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h +++ b/src/gui/text/unix/qgenericunixfontdatabase_p.h @@ -44,8 +44,8 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to // version without notice, or even be removed. // // We mean it. @@ -54,11 +54,11 @@ #include <QtGui/private/qtguiglobal_p.h> #if QT_CONFIG(fontconfig) -#include <QtFontDatabaseSupport/private/qfontconfigdatabase_p.h> -typedef QFontconfigDatabase QGenericUnixFontDatabase; +#include <QtGui/private/qfontconfigdatabase_p.h> +using QGenericUnixFontDatabase = QFontconfigDatabase; #else #include <QtGui/private/qfreetypefontdatabase_p.h> -typedef QFreeTypeFontDatabase QGenericUnixFontDatabase; +using QGenericUnixFontDatabase = QFreeTypeFontDatabase; #endif //Q_FONTCONFIGDATABASE #endif // QGENERICUNIXFONTDATABASE_H diff --git a/src/gui/text/unix/unix.pri b/src/gui/text/unix/unix.pri new file mode 100644 index 0000000000..538c16ecfe --- /dev/null +++ b/src/gui/text/unix/unix.pri @@ -0,0 +1,13 @@ +HEADERS += text/unix/qgenericunixfontdatabase_p.h + +qtConfig(fontconfig) { + HEADERS += \ + text/unix/qfontconfigdatabase_p.h \ + text/unix/qfontenginemultifontconfig_p.h + + SOURCES += \ + text/unix/qfontconfigdatabase.cpp \ + text/unix/qfontenginemultifontconfig.cpp + + QMAKE_USE_PRIVATE += fontconfig +} diff --git a/src/platformsupport/.prev_CMakeLists.txt b/src/platformsupport/.prev_CMakeLists.txt index 68cdfd29fb..a435067b73 100644 --- a/src/platformsupport/.prev_CMakeLists.txt +++ b/src/platformsupport/.prev_CMakeLists.txt @@ -7,9 +7,6 @@ add_subdirectory(linuxofono) if(QT_FEATURE_xcb OR (UNIX AND NOT MACOS AND NOT UIKIT)) add_subdirectory(themes) endif() -if(WIN32 OR (QT_FEATURE_freetype AND NOT APPLE)) - add_subdirectory(fontdatabases) -endif() if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon) add_subdirectory(input) endif() diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index 59de3cfe4d..5318c26cf3 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -11,9 +11,6 @@ if (QT_FEATURE_dbus) add_subdirectory(linuxofono) endif() # special case end -if(WIN32 OR (QT_FEATURE_freetype AND NOT APPLE)) - add_subdirectory(fontdatabases) -endif() if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon) add_subdirectory(input) endif() diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt deleted file mode 100644 index a19195bc02..0000000000 --- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Generated from fontdatabases.pro. - -##################################################################### -## FontDatabaseSupport Module: -##################################################################### - -qt_add_module(FontDatabaseSupport - STATIC - INTERNAL_MODULE - DEFINES - QT_NO_CAST_FROM_ASCII - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - PRECOMPILED_HEADER - "../../corelib/global/qt_pch.h" -) - -#### Keys ignored in scope 1:.:.:fontdatabases.pro:<TRUE>: -# MODULE = "fontdatabase_support" - -## Scopes: -##################################################################### - -qt_extend_target(FontDatabaseSupport CONDITION UNIX - SOURCES - genericunix/qgenericunixfontdatabase_p.h -) - -qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig - SOURCES - fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h - fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h - LIBRARIES - Fontconfig::Fontconfig -) diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt deleted file mode 100644 index 2f4519ec30..0000000000 --- a/src/platformsupport/fontdatabases/CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -# Generated from fontdatabases.pro. - -qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype) # special case -qt_find_package(Fontconfig) # special case - -##################################################################### -## FontDatabaseSupport Module: -##################################################################### - -qt_add_module(FontDatabaseSupport - STATIC - INTERNAL_MODULE - DEFINES - QT_NO_CAST_FROM_ASCII - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - PRECOMPILED_HEADER - "../../corelib/global/qt_pch.h" -) - -#### Keys ignored in scope 1:.:.:fontdatabases.pro:<TRUE>: -# MODULE = "fontdatabase_support" - -## Scopes: -##################################################################### - -qt_extend_target(FontDatabaseSupport CONDITION UNIX - SOURCES - genericunix/qgenericunixfontdatabase_p.h -) - -qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig - SOURCES - fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h - fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h - LIBRARIES - Fontconfig::Fontconfig -) - -# special case begin -if(TARGET WrapFreetype::WrapFreetype) - qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig - LIBRARIES - WrapFreetype::WrapFreetype -) -endif() -# special case end diff --git a/src/platformsupport/fontdatabases/fake.cpp b/src/platformsupport/fontdatabases/fake.cpp deleted file mode 100644 index e69de29bb2..0000000000 --- a/src/platformsupport/fontdatabases/fake.cpp +++ /dev/null diff --git a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri deleted file mode 100644 index 671d6be237..0000000000 --- a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri +++ /dev/null @@ -1,6 +0,0 @@ -HEADERS += $$PWD/qfontconfigdatabase_p.h \ - $$PWD/qfontenginemultifontconfig_p.h -SOURCES += $$PWD/qfontconfigdatabase.cpp \ - $$PWD/qfontenginemultifontconfig.cpp - -QMAKE_USE_PRIVATE += fontconfig diff --git a/src/platformsupport/fontdatabases/fontdatabases.pro b/src/platformsupport/fontdatabases/fontdatabases.pro deleted file mode 100644 index 5406291cea..0000000000 --- a/src/platformsupport/fontdatabases/fontdatabases.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = QtFontDatabaseSupport -MODULE = fontdatabase_support - -QT = core-private gui-private -CONFIG += static internal_module - -DEFINES += QT_NO_CAST_FROM_ASCII -PRECOMPILED_HEADER = ../../corelib/global/qt_pch.h - -unix { - include($$PWD/genericunix/genericunix.pri) -} - -qtConfig(fontconfig) { - include($$PWD/fontconfig/fontconfig.pri) -} - -load(qt_module) diff --git a/src/platformsupport/fontdatabases/genericunix/genericunix.pri b/src/platformsupport/fontdatabases/genericunix/genericunix.pri deleted file mode 100644 index e9db6c07e2..0000000000 --- a/src/platformsupport/fontdatabases/genericunix/genericunix.pri +++ /dev/null @@ -1 +0,0 @@ -HEADERS += $$PWD/qgenericunixfontdatabase_p.h diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index d6d04f89b9..e54fb96dbe 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -9,9 +9,6 @@ SUBDIRS = \ if(unix:!uikit:!macos)|qtConfig(xcb): \ SUBDIRS += themes -if(qtConfig(freetype):!darwin)|win32: \ - SUBDIRS += fontdatabases - qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConfig(xkbcommon) { SUBDIRS += input input.depends += devicediscovery diff --git a/src/plugins/platforms/bsdfb/bsdfb.pro b/src/plugins/platforms/bsdfb/bsdfb.pro index bb41cc78f0..21ebbb0496 100644 --- a/src/plugins/platforms/bsdfb/bsdfb.pro +++ b/src/plugins/platforms/bsdfb/bsdfb.pro @@ -3,7 +3,7 @@ TARGET = qbsdfb QT += \ core-private gui-private \ service_support-private \ - fontdatabase_support-private fb_support-private + fb_support-private qtHaveModule(input_support-private): \ QT += input_support-private diff --git a/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp b/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp index 59f306df69..04c84d2942 100644 --- a/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp +++ b/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp @@ -41,7 +41,7 @@ #include "qbsdfbintegration.h" #include "qbsdfbscreen.h" -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt index 17d4dbe1f4..a9bac7c988 100644 --- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt @@ -22,7 +22,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin PkgConfig::DirectFB Qt::Core Qt::CorePrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt index a2bd0b5a1f..ce6e4af3a3 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -26,7 +26,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin PkgConfig::DirectFB Qt::Core Qt::CorePrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index 13140a28b2..57195de551 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/src/plugins/platforms/directfb/directfb.pro @@ -2,8 +2,7 @@ TARGET = qdirectfb QT += \ core-private gui-private \ - service_support-private \ - fontdatabase_support-private + service_support-private QMAKE_USE += directfb diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp index 9eaa4abd1a..393ce69c52 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp +++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp @@ -44,7 +44,7 @@ #include "qdirectfbcursor.h" #include "qdirectfbwindow.h" -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index d14b1f0ca8..106e94718a 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -24,7 +24,6 @@ qt_add_module(EglFSDeviceIntegration Qt::DeviceDiscoverySupportPrivate Qt::EglSupportPrivate Qt::FbSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::GuiPrivate Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 17bc0f9571..d1211f38b8 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -25,7 +25,6 @@ qt_add_module(EglFSDeviceIntegration Qt::DeviceDiscoverySupportPrivate Qt::EglSupportPrivate Qt::FbSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::GuiPrivate Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp index 0f9e5fec15..651c28745b 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -67,7 +67,7 @@ # include <QtEglSupport/private/qeglpbuffer_p.h> #endif -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> #include <QtThemeSupport/private/qgenericunixthemes_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro index e61507ecae..dce1a4b894 100644 --- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro +++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro @@ -11,7 +11,7 @@ MODULE = eglfsdeviceintegration QT += \ core-private gui-private \ devicediscovery_support-private \ - service_support-private theme_support-private fontdatabase_support-private \ + service_support-private theme_support-private \ fb_support-private egl_support-private qtHaveModule(input_support-private): \ diff --git a/src/plugins/platforms/integrity/integrity.pro b/src/plugins/platforms/integrity/integrity.pro index 12467da5c4..51511f38a6 100644 --- a/src/plugins/platforms/integrity/integrity.pro +++ b/src/plugins/platforms/integrity/integrity.pro @@ -3,7 +3,7 @@ TARGET = integrityfb QT += \ core-private gui-private \ service_support-private \ - fontdatabase_support-private fb_support-private + fb_support-private SOURCES = \ main.cpp \ diff --git a/src/plugins/platforms/integrity/qintegrityfbintegration.cpp b/src/plugins/platforms/integrity/qintegrityfbintegration.cpp index 2889fbb79d..d53088dff7 100644 --- a/src/plugins/platforms/integrity/qintegrityfbintegration.cpp +++ b/src/plugins/platforms/integrity/qintegrityfbintegration.cpp @@ -41,7 +41,7 @@ #include "qintegrityfbscreen.h" #include "qintegrityhidmanager.h" -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index 0f9ca12581..caa3f03f5d 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -17,7 +17,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin Qt::Core Qt::CorePrivate Qt::FbSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index 83bd976caf..fdfe076902 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -18,7 +18,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin Qt::Core Qt::CorePrivate Qt::FbSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::ServiceSupportPrivate diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro index adc2108c1f..9af0956cf7 100644 --- a/src/plugins/platforms/linuxfb/linuxfb.pro +++ b/src/plugins/platforms/linuxfb/linuxfb.pro @@ -5,7 +5,7 @@ DEFINES += QT_NO_FOREACH QT += \ core-private gui-private \ service_support-private \ - fontdatabase_support-private fb_support-private + fb_support-private qtHaveModule(input_support-private): \ QT += input_support-private diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp index 740f1b87a7..4940302d36 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp @@ -43,7 +43,7 @@ #include "qlinuxfbdrmscreen.h" #endif -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index b5e165e2f1..bb670b4dd4 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -26,15 +26,10 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX AND NOT APPLE - PUBLIC_LIBRARIES - Qt::FontDatabaseSupportPrivate -) - qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) -#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 3:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index 958204bcd8..bf2e644251 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -29,15 +29,10 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX AND NOT APPLE - PUBLIC_LIBRARIES - Qt::FontDatabaseSupportPrivate -) - qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) -#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 3:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index 4eebd0f6ad..54f0ac905f 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -3,8 +3,6 @@ TARGET = qminimal QT += \ core-private gui-private -!darwin:!win32: QT += fontdatabase_support-private - DEFINES += QT_NO_FOREACH SOURCES = main.cpp \ diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 4a3b052200..857594cc2a 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -56,7 +56,7 @@ #endif #if QT_CONFIG(fontconfig) -# include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +# include <QtGui/private/qgenericunixfontdatabase_p.h> # include <qpa/qplatformfontdatabase.h> #endif diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt index 6d73a8628f..2b60f9550c 100644 --- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt @@ -18,7 +18,6 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin Qt::Core Qt::CorePrivate Qt::EglSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate ) diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index e6df27d58a..c6edc29042 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin Qt::Core Qt::CorePrivate Qt::EglSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate ) diff --git a/src/plugins/platforms/minimalegl/minimalegl.pro b/src/plugins/platforms/minimalegl/minimalegl.pro index 24f86c1d9d..b846e58d7c 100644 --- a/src/plugins/platforms/minimalegl/minimalegl.pro +++ b/src/plugins/platforms/minimalegl/minimalegl.pro @@ -2,7 +2,7 @@ TARGET = qminimalegl QT += \ core-private gui-private \ - fontdatabase_support-private egl_support-private + egl_support-private #DEFINES += QEGL_EXTRA_DEBUG diff --git a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp index ee72b7ba70..654780a44c 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp @@ -43,7 +43,7 @@ #ifndef QT_NO_OPENGL # include "qminimaleglbackingstore.h" #endif -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #if defined(Q_OS_UNIX) # include <QtGui/private/qgenericunixeventdispatcher_p.h> diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index 6ca250161f..68abfbdea5 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -27,11 +27,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX AND NOT APPLE - PUBLIC_LIBRARIES - Qt::FontDatabaseSupportPrivate -) - qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h @@ -39,5 +34,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_ Qt::GlxSupportPrivate ) -#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index a798344238..52d2b829d8 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -28,11 +28,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX AND NOT APPLE - PUBLIC_LIBRARIES - Qt::FontDatabaseSupportPrivate -) - qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h @@ -40,5 +35,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_ Qt::GlxSupportPrivate ) -#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro index 4bdbf7224a..5683b5e8ce 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -3,8 +3,6 @@ TARGET = qoffscreen QT += \ core-private gui-private -!darwin:!win32: QT += fontdatabase_support-private - DEFINES += QT_NO_FOREACH SOURCES = main.cpp \ diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp index 7d2d585194..ef0eb7e9cf 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp @@ -47,7 +47,7 @@ #include <qpa/qplatformfontdatabase.h> #include <QtGui/private/qcoretextfontdatabase_p.h> #else -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #endif #elif defined(Q_OS_WIN) #include <QtGui/private/qfreetypefontdatabase_p.h> diff --git a/src/plugins/platforms/openwfd/openwf.pro b/src/plugins/platforms/openwfd/openwf.pro index fb77ae5d65..0c097f4676 100644 --- a/src/plugins/platforms/openwfd/openwf.pro +++ b/src/plugins/platforms/openwfd/openwf.pro @@ -1,8 +1,7 @@ TARGET = qopenwf QT += \ - core-private gui-private \ - fontdatabase_support-private + core-private gui-private HEADERS += \ qopenwfddevice.h \ diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.cpp b/src/plugins/platforms/openwfd/qopenwfdintegration.cpp index ccbd3f5ec5..253bdf39e7 100644 --- a/src/plugins/platforms/openwfd/qopenwfdintegration.cpp +++ b/src/plugins/platforms/openwfd/qopenwfdintegration.cpp @@ -53,7 +53,7 @@ #include <qpa/qwindowsysteminterface.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <stdio.h> diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro index a5848a291b..bc7181fa21 100644 --- a/src/plugins/platforms/qnx/qnx.pro +++ b/src/plugins/platforms/qnx/qnx.pro @@ -2,7 +2,7 @@ TARGET = qqnx QT += \ core-private gui-private \ - fontdatabase_support-private egl_support-private + egl_support-private # Uncomment this to build with support for IMF once it becomes available in the BBNDK #CONFIG += qqnx_imf diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt index 4131d71c1f..ebe1cd62d4 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin Qt::Core Qt::CorePrivate Qt::FbSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::Network diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index a3870b5569..6347030b34 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -20,7 +20,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin Qt::Core Qt::CorePrivate Qt::FbSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate Qt::Network diff --git a/src/plugins/platforms/vnc/qvncintegration.cpp b/src/plugins/platforms/vnc/qvncintegration.cpp index 09ee88cd89..6a0cc79402 100644 --- a/src/plugins/platforms/vnc/qvncintegration.cpp +++ b/src/plugins/platforms/vnc/qvncintegration.cpp @@ -41,7 +41,7 @@ #include "qvncscreen.h" #include "qvnc_p.h" -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h> diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro index fabbaea71f..c679b114ab 100644 --- a/src/plugins/platforms/vnc/vnc.pro +++ b/src/plugins/platforms/vnc/vnc.pro @@ -2,8 +2,7 @@ TARGET = qvnc QT += \ core-private network gui-private \ - service_support-private fb_support-private \ - fontdatabase_support-private + service_support-private fb_support-private qtHaveModule(input_support-private): \ QT += input_support-private diff --git a/src/plugins/platforms/wasm/wasm.pro b/src/plugins/platforms/wasm/wasm.pro index c02cb52f6b..e5feaaf944 100644 --- a/src/plugins/platforms/wasm/wasm.pro +++ b/src/plugins/platforms/wasm/wasm.pro @@ -2,7 +2,7 @@ TARGET = qwasm CONFIG += static plugin QT += \ core-private gui-private \ - fontdatabase_support-private egl_support-private + egl_support-private qtConfig(opengl): QT += opengl-private diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index e459d27146..c5012582ea 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -42,7 +42,6 @@ qt_add_module(XcbQpa PkgConfig::XKB_COMMON_X11 Qt::CorePrivate Qt::EdidSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::GuiPrivate Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 65c085ff10..1288cc6a5f 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -42,7 +42,6 @@ qt_add_module(XcbQpa PkgConfig::XKB_COMMON_X11 Qt::CorePrivate Qt::EdidSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::GuiPrivate Qt::ServiceSupportPrivate Qt::ThemeSupportPrivate diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index c2109f8993..7956da2c91 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -59,7 +59,7 @@ #include <xcb/xcb.h> -#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> #if QT_CONFIG(opengl) #include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index eced76ec31..3cca31aa2f 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -5,7 +5,6 @@ DEFINES += QT_NO_FOREACH QT += \ core-private gui-private \ service_support-private theme_support-private \ - fontdatabase_support-private \ edid_support-private \ xkbcommon_support-private |