AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Unix font databases into QtGui

Browse Source 
Task-number: QTBUG-83255
Change-Id: Id85a1e0f3de371951783fe97485158c4a02e1f15
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Friedemann Kleint 2020-06-12 07:38:54 +02:00
parent 927a82f5e0
commit 6be9830d86
58 changed files with 81 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/.prev_CMakeLists.txt
View File

@ -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

17
src/gui/CMakeLists.txt
View File

@ -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

4
src/gui/text/text.pri
View File

@ -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)
}

0
src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp → src/gui/text/unix/qfontconfigdatabase.cpp
View File

2
src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h → src/gui/text/unix/qfontconfigdatabase_p.h
View File

@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
class QFontEngineFT;
class QFontconfigDatabase : public QFreeTypeFontDatabase
class Q_GUI_EXPORT QFontconfigDatabase : public QFreeTypeFontDatabase
{
public:
void populateFontDatabase() override;

0
src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp → src/gui/text/unix/qfontenginemultifontconfig.cpp
View File

6
src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h → src/gui/text/unix/qfontenginemultifontconfig_p.h
View File

@ -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);

10
src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h → src/gui/text/unix/qgenericunixfontdatabase_p.h
View File

@ -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

13
src/gui/text/unix/unix.pri Normal file
View File

@ -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
}

3
src/platformsupport/.prev_CMakeLists.txt
View File

@ -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()

3
src/platformsupport/CMakeLists.txt
View File

@ -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()

36
src/platformsupport/fontdatabases/.prev_CMakeLists.txt
View File

@ -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
)

48
src/platformsupport/fontdatabases/CMakeLists.txt
View File

@ -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

0
src/platformsupport/fontdatabases/fake.cpp
View File

6
src/platformsupport/fontdatabases/fontconfig/fontconfig.pri
View File

@ -1,6 +0,0 @@
HEADERS += $$PWD/qfontconfigdatabase_p.h \
$$PWD/qfontenginemultifontconfig_p.h
SOURCES += $$PWD/qfontconfigdatabase.cpp \
$$PWD/qfontenginemultifontconfig.cpp
QMAKE_USE_PRIVATE += fontconfig

18
src/platformsupport/fontdatabases/fontdatabases.pro
View File

@ -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)

1
src/platformsupport/fontdatabases/genericunix/genericunix.pri
View File

@ -1 +0,0 @@
HEADERS += $$PWD/qgenericunixfontdatabase_p.h

3
src/platformsupport/platformsupport.pro
View File

@ -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

2
src/plugins/platforms/bsdfb/bsdfb.pro
View File

@ -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

2
src/plugins/platforms/bsdfb/qbsdfbintegration.cpp
View File

@ -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>

1
src/plugins/platforms/directfb/.prev_CMakeLists.txt
View File

@ -22,7 +22,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
PkgConfig::DirectFB
Qt::Core
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate
Qt::ServiceSupportPrivate

1
src/plugins/platforms/directfb/CMakeLists.txt
View File

@ -26,7 +26,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
PkgConfig::DirectFB
Qt::Core
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate
Qt::ServiceSupportPrivate

3
src/plugins/platforms/directfb/directfb.pro
View File

@ -2,8 +2,7 @@ TARGET = qdirectfb
QT += \
core-private gui-private \
service_support-private \
fontdatabase_support-private
service_support-private
QMAKE_USE += directfb

2
src/plugins/platforms/directfb/qdirectfbintegration.cpp
View File

@ -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>

1
src/plugins/platforms/eglfs/.prev_CMakeLists.txt
View File

@ -24,7 +24,6 @@ qt_add_module(EglFSDeviceIntegration
Qt::DeviceDiscoverySupportPrivate
Qt::EglSupportPrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate

1
src/plugins/platforms/eglfs/CMakeLists.txt
View File

@ -25,7 +25,6 @@ qt_add_module(EglFSDeviceIntegration
Qt::DeviceDiscoverySupportPrivate
Qt::EglSupportPrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate

2
src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
View File

@ -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>

2
src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
View File

@ -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): \

2
src/plugins/platforms/integrity/integrity.pro
View File

@ -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 \

2
src/plugins/platforms/integrity/qintegrityfbintegration.cpp
View File

@ -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>

1
src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
View File

@ -17,7 +17,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate
Qt::ServiceSupportPrivate

1
src/plugins/platforms/linuxfb/CMakeLists.txt
View File

@ -18,7 +18,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate
Qt::ServiceSupportPrivate

2
src/plugins/platforms/linuxfb/linuxfb.pro
View File

@ -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

2
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
View File

@ -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>

7
src/plugins/platforms/minimal/.prev_CMakeLists.txt
View File

@ -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 = "-"

7
src/plugins/platforms/minimal/CMakeLists.txt
View File

@ -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 = "-"

2
src/plugins/platforms/minimal/minimal.pro
View File

@ -3,8 +3,6 @@ TARGET = qminimal
QT += \
core-private gui-private
!darwin:!win32: QT += fontdatabase_support-private
DEFINES += QT_NO_FOREACH
SOURCES = main.cpp \

2
src/plugins/platforms/minimal/qminimalintegration.cpp
View File

@ -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

1
src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
View File

@ -18,7 +18,6 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::EglSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate
)

1
src/plugins/platforms/minimalegl/CMakeLists.txt
View File

@ -19,7 +19,6 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::EglSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate
)

2
src/plugins/platforms/minimalegl/minimalegl.pro
View File

@ -2,7 +2,7 @@ TARGET = qminimalegl
QT += \
core-private gui-private \
fontdatabase_support-private egl_support-private
egl_support-private
#DEFINES += QEGL_EXTRA_DEBUG

2
src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
View File

@ -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>

7
src/plugins/platforms/offscreen/.prev_CMakeLists.txt
View File

@ -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 = "-"

7
src/plugins/platforms/offscreen/CMakeLists.txt
View File

@ -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 = "-"

2
src/plugins/platforms/offscreen/offscreen.pro
View File

@ -3,8 +3,6 @@ TARGET = qoffscreen
QT += \
core-private gui-private
!darwin:!win32: QT += fontdatabase_support-private
DEFINES += QT_NO_FOREACH
SOURCES = main.cpp \

2
src/plugins/platforms/offscreen/qoffscreenintegration.cpp
View File

@ -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>

3
src/plugins/platforms/openwfd/openwf.pro
View File

@ -1,8 +1,7 @@
TARGET = qopenwf
QT += \
core-private gui-private \
fontdatabase_support-private
core-private gui-private
HEADERS += \
qopenwfddevice.h \

2
src/plugins/platforms/openwfd/qopenwfdintegration.cpp
View File

@ -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>

2
src/plugins/platforms/qnx/qnx.pro
View File

@ -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

1
src/plugins/platforms/vnc/.prev_CMakeLists.txt
View File

@ -19,7 +19,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate
Qt::Network

1
src/plugins/platforms/vnc/CMakeLists.txt
View File

@ -20,7 +20,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate
Qt::Network

2
src/plugins/platforms/vnc/qvncintegration.cpp
View File

@ -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>

3
src/plugins/platforms/vnc/vnc.pro
View File

@ -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

2
src/plugins/platforms/wasm/wasm.pro
View File

@ -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

1
src/plugins/platforms/xcb/.prev_CMakeLists.txt
View File

@ -42,7 +42,6 @@ qt_add_module(XcbQpa
PkgConfig::XKB_COMMON_X11
Qt::CorePrivate
Qt::EdidSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate

1
src/plugins/platforms/xcb/CMakeLists.txt
View File

@ -42,7 +42,6 @@ qt_add_module(XcbQpa
PkgConfig::XKB_COMMON_X11
Qt::CorePrivate
Qt::EdidSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate

2
src/plugins/platforms/xcb/qxcbintegration.cpp
View File

@ -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>

1
src/plugins/platforms/xcb/xcb_qpa_lib.pro
View File

@ -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