Add the 'Private' suffix to the internal module names
Rename internal modules to adjust their names to the internal module policy. Also modify mappings of the qmake file converters. Change-Id: I69aee1e8136c2379608d9d22d718f8c8a5f73124 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
4333bfd9d8
commit
75fffe0067
@ -1,10 +1,10 @@
|
|||||||
# Generated from devicediscovery.pro.
|
# Generated from devicediscovery.pro.
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
## DeviceDiscoverySupport Module:
|
## DeviceDiscoverySupportPrivate Module:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_add_module(DeviceDiscoverySupport
|
qt_internal_add_module(DeviceDiscoverySupportPrivate
|
||||||
CONFIG_MODULE_NAME devicediscovery_support
|
CONFIG_MODULE_NAME devicediscovery_support
|
||||||
STATIC
|
STATIC
|
||||||
INTERNAL_MODULE
|
INTERNAL_MODULE
|
||||||
@ -23,19 +23,19 @@ qt_internal_add_module(DeviceDiscoverySupport
|
|||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev
|
qt_internal_extend_target(DeviceDiscoverySupportPrivate CONDITION QT_FEATURE_libudev
|
||||||
SOURCES
|
SOURCES
|
||||||
qdevicediscovery_udev.cpp qdevicediscovery_udev_p.h
|
qdevicediscovery_udev.cpp qdevicediscovery_udev_p.h
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
PkgConfig::Libudev
|
PkgConfig::Libudev
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
|
qt_internal_extend_target(DeviceDiscoverySupportPrivate CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
|
||||||
SOURCES
|
SOURCES
|
||||||
qdevicediscovery_static.cpp qdevicediscovery_static_p.h
|
qdevicediscovery_static.cpp qdevicediscovery_static_p.h
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(DeviceDiscoverySupport CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
|
qt_internal_extend_target(DeviceDiscoverySupportPrivate CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
|
||||||
SOURCES
|
SOURCES
|
||||||
qdevicediscovery_dummy.cpp qdevicediscovery_dummy_p.h
|
qdevicediscovery_dummy.cpp qdevicediscovery_dummy_p.h
|
||||||
)
|
)
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
# Generated from fbconvenience.pro.
|
# Generated from fbconvenience.pro.
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
## FbSupport Module:
|
## FbSupportPrivate Module:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_add_module(FbSupport
|
qt_internal_add_module(FbSupportPrivate
|
||||||
CONFIG_MODULE_NAME fb_support
|
CONFIG_MODULE_NAME fb_support
|
||||||
STATIC
|
STATIC
|
||||||
INTERNAL_MODULE
|
INTERNAL_MODULE
|
||||||
|
@ -6,10 +6,10 @@ qt_find_package(Tslib) # special case
|
|||||||
qt_find_package(Mtdev) # special case
|
qt_find_package(Mtdev) # special case
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
## InputSupport Module:
|
## InputSupportPrivate Module:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_add_module(InputSupport
|
qt_internal_add_module(InputSupportPrivate
|
||||||
CONFIG_MODULE_NAME input_support
|
CONFIG_MODULE_NAME input_support
|
||||||
STATIC
|
STATIC
|
||||||
INTERNAL_MODULE
|
INTERNAL_MODULE
|
||||||
@ -29,7 +29,7 @@ qt_internal_add_module(InputSupport
|
|||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev
|
qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev
|
||||||
SOURCES
|
SOURCES
|
||||||
evdevkeyboard/qevdevkeyboard_defaultmap_p.h
|
evdevkeyboard/qevdevkeyboard_defaultmap_p.h
|
||||||
evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h
|
evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h
|
||||||
@ -42,35 +42,35 @@ qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev
|
|||||||
evdevtouch/../shared
|
evdevtouch/../shared
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
|
qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
|
||||||
SOURCES
|
SOURCES
|
||||||
evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h
|
evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h
|
||||||
evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h
|
evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
|
qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
PkgConfig::Libudev
|
PkgConfig::Libudev
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
|
qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
PkgConfig::Libudev
|
PkgConfig::Libudev
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
|
qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
PkgConfig::Mtdev
|
PkgConfig::Mtdev
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_tslib
|
qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_tslib
|
||||||
SOURCES
|
SOURCES
|
||||||
tslib/qtslib.cpp tslib/qtslib_p.h
|
tslib/qtslib.cpp tslib/qtslib_p.h
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
PkgConfig::Tslib
|
PkgConfig::Tslib
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput
|
qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_libinput
|
||||||
SOURCES
|
SOURCES
|
||||||
libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h
|
libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h
|
||||||
libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h
|
libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h
|
||||||
@ -83,19 +83,19 @@ qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput
|
|||||||
PkgConfig::Libudev
|
PkgConfig::Libudev
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
|
qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
XKB::XKB
|
XKB::XKB
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
|
qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
|
||||||
SOURCES
|
SOURCES
|
||||||
shared/devicehandlerlist_p.h
|
shared/devicehandlerlist_p.h
|
||||||
shared/qevdevutil.cpp shared/qevdevutil_p.h
|
shared/qevdevutil.cpp shared/qevdevutil_p.h
|
||||||
shared/qoutputmapping.cpp shared/qoutputmapping_p.h
|
shared/qoutputmapping.cpp shared/qoutputmapping_p.h
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
|
qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_integrityhid
|
||||||
SOURCES
|
SOURCES
|
||||||
integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h
|
integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
|
@ -3,10 +3,10 @@
|
|||||||
qt_find_package(Libdrm) # special case
|
qt_find_package(Libdrm) # special case
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
## KmsSupport Module:
|
## KmsSupportPrivate Module:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_add_module(KmsSupport
|
qt_internal_add_module(KmsSupportPrivate
|
||||||
CONFIG_MODULE_NAME kms_support
|
CONFIG_MODULE_NAME kms_support
|
||||||
STATIC
|
STATIC
|
||||||
INTERNAL_MODULE
|
INTERNAL_MODULE
|
||||||
|
@ -18,10 +18,10 @@ set(QT_QPA_DEFAULT_EGLFS_INTEGRATION "${_device_integration}" CACHE STRING "Defa
|
|||||||
# special case end
|
# special case end
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
## EglFSDeviceIntegration Module:
|
## EglFSDeviceIntegrationPrivate Module:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_add_module(EglFSDeviceIntegration
|
qt_internal_add_module(EglFSDeviceIntegrationPrivate
|
||||||
INTERNAL_MODULE
|
INTERNAL_MODULE
|
||||||
SOURCES
|
SOURCES
|
||||||
api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h
|
api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h
|
||||||
@ -51,12 +51,12 @@ qt_internal_add_module(EglFSDeviceIntegration
|
|||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
|
qt_internal_extend_target(EglFSDeviceIntegrationPrivate CONDITION TARGET Qt::InputSupportPrivate
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::InputSupportPrivate
|
Qt::InputSupportPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
|
qt_internal_extend_target(EglFSDeviceIntegrationPrivate CONDITION QT_FEATURE_opengl
|
||||||
SOURCES
|
SOURCES
|
||||||
api/qeglfscontext.cpp api/qeglfscontext_p.h
|
api/qeglfscontext.cpp api/qeglfscontext_p.h
|
||||||
api/qeglfscursor.cpp api/qeglfscursor_p.h
|
api/qeglfscursor.cpp api/qeglfscursor_p.h
|
||||||
@ -66,12 +66,12 @@ qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
|
|||||||
|
|
||||||
# special case begin
|
# special case begin
|
||||||
# comment out
|
# comment out
|
||||||
#qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
|
#qt_internal_extend_target(EglFSDeviceIntegrationPrivate CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
|
||||||
#DEFINES
|
#DEFINES
|
||||||
#EGLFS_PLATFORM_HOOKS
|
#EGLFS_PLATFORM_HOOKS
|
||||||
#)
|
#)
|
||||||
|
|
||||||
#qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
|
#qt_internal_extend_target(EglFSDeviceIntegrationPrivate CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
|
||||||
#DEFINES
|
#DEFINES
|
||||||
#EGLFS_PREFERRED_PLUGIN=
|
#EGLFS_PREFERRED_PLUGIN=
|
||||||
#)
|
#)
|
||||||
@ -84,7 +84,7 @@ if(QT_FEATURE_cursor)
|
|||||||
"cursor.json"
|
"cursor.json"
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_add_resource(EglFSDeviceIntegration "cursor"
|
qt_internal_add_resource(EglFSDeviceIntegrationPrivate "cursor"
|
||||||
PREFIX
|
PREFIX
|
||||||
"/"
|
"/"
|
||||||
FILES
|
FILES
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
# Generated from eglfs_kms.pro.
|
# Generated from eglfs_kms.pro.
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
## EglFsKmsGbmSupport Module:
|
## EglFsKmsGbmSupportPrivate Module:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_add_module(EglFsKmsGbmSupport
|
qt_internal_add_module(EglFsKmsGbmSupportPrivate
|
||||||
CONFIG_MODULE_NAME eglfs_kms_gbm_support
|
CONFIG_MODULE_NAME eglfs_kms_gbm_support
|
||||||
INTERNAL_MODULE
|
INTERNAL_MODULE
|
||||||
SOURCES
|
SOURCES
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
# Generated from eglfs_kms_support.pro.
|
# Generated from eglfs_kms_support.pro.
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
## EglFsKmsSupport Module:
|
## EglFsKmsSupportPrivate Module:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_add_module(EglFsKmsSupport
|
qt_internal_add_module(EglFsKmsSupportPrivate
|
||||||
CONFIG_MODULE_NAME eglfs_kms_support
|
CONFIG_MODULE_NAME eglfs_kms_support
|
||||||
INTERNAL_MODULE
|
INTERNAL_MODULE
|
||||||
SOURCES
|
SOURCES
|
||||||
@ -26,7 +26,7 @@ qt_internal_add_module(EglFsKmsSupport
|
|||||||
)
|
)
|
||||||
|
|
||||||
# begin special case
|
# begin special case
|
||||||
qt_internal_extend_target(EglFsKmsSupport
|
qt_internal_extend_target(EglFsKmsSupportPrivate
|
||||||
CONDITION QNX
|
CONDITION QNX
|
||||||
COMPILE_OPTIONS -fpermissive
|
COMPILE_OPTIONS -fpermissive
|
||||||
)
|
)
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
# Generated from xcb.pro.
|
# Generated from xcb.pro.
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
## XcbQpa Module:
|
## XcbQpaPrivate Module:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_add_module(XcbQpa
|
qt_internal_add_module(XcbQpaPrivate
|
||||||
CONFIG_MODULE_NAME xcb_qpa_lib
|
CONFIG_MODULE_NAME xcb_qpa_lib
|
||||||
INTERNAL_MODULE
|
INTERNAL_MODULE
|
||||||
NO_MODULE_HEADERS
|
NO_MODULE_HEADERS
|
||||||
@ -61,28 +61,28 @@ qt_internal_add_module(XcbQpa
|
|||||||
)
|
)
|
||||||
|
|
||||||
# special case begin
|
# special case begin
|
||||||
qt_disable_apple_app_extension_api_only(XcbQpa)
|
qt_disable_apple_app_extension_api_only(XcbQpaPrivate)
|
||||||
# special case end
|
# special case end
|
||||||
|
|
||||||
## Scopes:
|
## Scopes:
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_opengl
|
qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_opengl
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
Qt::OpenGLPrivate
|
Qt::OpenGLPrivate
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_glib
|
qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_glib
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
GLIB2::GLIB2
|
GLIB2::GLIB2
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
|
qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_draganddrop
|
||||||
SOURCES
|
SOURCES
|
||||||
qxcbdrag.cpp qxcbdrag.h
|
qxcbdrag.cpp qxcbdrag.h
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
|
qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_xcb_xlib
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
X11::XCB
|
X11::XCB
|
||||||
# special case begin
|
# special case begin
|
||||||
@ -93,30 +93,30 @@ qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
|
|||||||
# special case end
|
# special case end
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
|
qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_xcb_sm
|
||||||
SOURCES
|
SOURCES
|
||||||
qxcbsessionmanager.cpp qxcbsessionmanager.h
|
qxcbsessionmanager.cpp qxcbsessionmanager.h
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
${X11_SM_LIB} ${X11_ICE_LIB}
|
${X11_SM_LIB} ${X11_ICE_LIB}
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
|
qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_vulkan
|
||||||
SOURCES
|
SOURCES
|
||||||
qxcbvulkaninstance.cpp qxcbvulkaninstance.h
|
qxcbvulkaninstance.cpp qxcbvulkaninstance.h
|
||||||
qxcbvulkanwindow.cpp qxcbvulkanwindow.h
|
qxcbvulkanwindow.cpp qxcbvulkanwindow.h
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
|
qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_dlopen
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
${CMAKE_DL_LIBS}
|
${CMAKE_DL_LIBS}
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION CLANG AND NOT ICC
|
qt_internal_extend_target(XcbQpaPrivate CONDITION CLANG AND NOT ICC
|
||||||
COMPILE_OPTIONS
|
COMPILE_OPTIONS
|
||||||
-ftemplate-depth=1024
|
-ftemplate-depth=1024
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
|
qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_xcb_native_painting
|
||||||
SOURCES
|
SOURCES
|
||||||
nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h
|
nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h
|
||||||
nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h
|
nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h
|
||||||
@ -130,27 +130,27 @@ qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
|
|||||||
nativepainting
|
nativepainting
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
|
qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
|
||||||
PUBLIC_LIBRARIES
|
PUBLIC_LIBRARIES
|
||||||
PkgConfig::XRender
|
PkgConfig::XRender
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
|
qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
|
||||||
LIBRARIES
|
LIBRARIES
|
||||||
WrapFreetype::WrapFreetype
|
WrapFreetype::WrapFreetype
|
||||||
)
|
)
|
||||||
|
|
||||||
# special case begin
|
# special case begin
|
||||||
if(QT_FEATURE_system_xcb_xinput)
|
if(QT_FEATURE_system_xcb_xinput)
|
||||||
qt_internal_extend_target(XcbQpa LIBRARIES XCB::XINPUT)
|
qt_internal_extend_target(XcbQpaPrivate LIBRARIES XCB::XINPUT)
|
||||||
else()
|
else()
|
||||||
set(xinput_source "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/libxcb/xinput.c")
|
set(xinput_source "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/libxcb/xinput.c")
|
||||||
set_source_files_properties(
|
set_source_files_properties(
|
||||||
"${xinput_source}"
|
"${xinput_source}"
|
||||||
PROPERTIES COMPILE_OPTIONS "-w"
|
PROPERTIES COMPILE_OPTIONS "-w"
|
||||||
)
|
)
|
||||||
target_sources(XcbQpa PRIVATE "${xinput_source}")
|
target_sources(XcbQpaPrivate PRIVATE "${xinput_source}")
|
||||||
target_include_directories(XcbQpa PRIVATE
|
target_include_directories(XcbQpaPrivate PRIVATE
|
||||||
"${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/include"
|
"${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/include"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
@ -129,14 +129,14 @@ _qt_library_map = [
|
|||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"devicediscovery",
|
"devicediscovery",
|
||||||
"Qt6",
|
"Qt6",
|
||||||
"Qt::DeviceDiscoverySupport",
|
"Qt::DeviceDiscoverySupportPrivate",
|
||||||
extra=["COMPONENTS", "DeviceDiscoverySupport"],
|
extra=["COMPONENTS", "DeviceDiscoverySupportPrivate"],
|
||||||
),
|
),
|
||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"devicediscovery_support",
|
"devicediscovery_support",
|
||||||
"Qt6",
|
"Qt6",
|
||||||
"Qt::DeviceDiscoverySupport",
|
"Qt::DeviceDiscoverySupportPrivate",
|
||||||
extra=["COMPONENTS", "DeviceDiscoverySupport"],
|
extra=["COMPONENTS", "DeviceDiscoverySupportPrivate"],
|
||||||
),
|
),
|
||||||
LibraryMapping("edid", "Qt6", "Qt::EdidSupport", extra=["COMPONENTS", "EdidSupport"]),
|
LibraryMapping("edid", "Qt6", "Qt::EdidSupport", extra=["COMPONENTS", "EdidSupport"]),
|
||||||
LibraryMapping("edid_support", "Qt6", "Qt::EdidSupport", extra=["COMPONENTS", "EdidSupport"]),
|
LibraryMapping("edid_support", "Qt6", "Qt::EdidSupport", extra=["COMPONENTS", "EdidSupport"]),
|
||||||
@ -144,17 +144,17 @@ _qt_library_map = [
|
|||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"eglfsdeviceintegration",
|
"eglfsdeviceintegration",
|
||||||
"Qt6",
|
"Qt6",
|
||||||
"Qt::EglFSDeviceIntegration",
|
"Qt::EglFSDeviceIntegrationPrivate",
|
||||||
extra=["COMPONENTS", "EglFSDeviceIntegration"],
|
extra=["COMPONENTS", "EglFSDeviceIntegrationPrivate"],
|
||||||
),
|
),
|
||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"eglfs_kms_support", "Qt6", "Qt::EglFsKmsSupport", extra=["COMPONENTS", "EglFsKmsSupport"]
|
"eglfs_kms_support", "Qt6", "Qt::EglFsKmsSupportPrivate", extra=["COMPONENTS", "EglFsKmsSupportPrivate"]
|
||||||
),
|
),
|
||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"eglfs_kms_gbm_support",
|
"eglfs_kms_gbm_support",
|
||||||
"Qt6",
|
"Qt6",
|
||||||
"Qt::EglFsKmsGbmSupport",
|
"Qt::EglFsKmsGbmSupportPrivate",
|
||||||
extra=["COMPONENTS", "EglFsKmsGbmSupport"],
|
extra=["COMPONENTS", "EglFsKmsGbmSupportPrivate"],
|
||||||
),
|
),
|
||||||
LibraryMapping("egl_support", "Qt6", "Qt::EglSupport", extra=["COMPONENTS", "EglSupport"]),
|
LibraryMapping("egl_support", "Qt6", "Qt::EglSupport", extra=["COMPONENTS", "EglSupport"]),
|
||||||
# enginio: Not needed in Qt6!
|
# enginio: Not needed in Qt6!
|
||||||
@ -170,8 +170,8 @@ _qt_library_map = [
|
|||||||
"Qt::EventDispatcherSupport",
|
"Qt::EventDispatcherSupport",
|
||||||
extra=["COMPONENTS", "EventDispatcherSupport"],
|
extra=["COMPONENTS", "EventDispatcherSupport"],
|
||||||
),
|
),
|
||||||
LibraryMapping("fbconvenience", "Qt6", "Qt::FbSupport", extra=["COMPONENTS", "FbSupport"]),
|
LibraryMapping("fbconvenience", "Qt6", "Qt::FbSupportPrivate", extra=["COMPONENTS", "FbSupportPrivate"]),
|
||||||
LibraryMapping("fb_support", "Qt6", "Qt::FbSupport", extra=["COMPONENTS", "FbSupport"]),
|
LibraryMapping("fb_support", "Qt6", "Qt::FbSupportPrivate", extra=["COMPONENTS", "FbSupportPrivate"]),
|
||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"fontdatabase_support",
|
"fontdatabase_support",
|
||||||
"Qt6",
|
"Qt6",
|
||||||
@ -195,9 +195,9 @@ _qt_library_map = [
|
|||||||
"Qt::HunspellInputMethod",
|
"Qt::HunspellInputMethod",
|
||||||
extra=["COMPONENTS", "HunspellInputMethod"],
|
extra=["COMPONENTS", "HunspellInputMethod"],
|
||||||
),
|
),
|
||||||
LibraryMapping("input", "Qt6", "Qt::InputSupport", extra=["COMPONENTS", "InputSupport"]),
|
LibraryMapping("input", "Qt6", "Qt::InputSupportPrivate", extra=["COMPONENTS", "InputSupportPrivate"]),
|
||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"input_support", "Qt6", "Qt::InputSupport", extra=["COMPONENTS", "InputSupport"]
|
"input_support", "Qt6", "Qt::InputSupportPrivate", extra=["COMPONENTS", "InputSupportPrivate"]
|
||||||
),
|
),
|
||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"installer-lib", "Qt6", "Qt::AppManInstaller", extra=["COMPONENTS", "AppManInstaller"]
|
"installer-lib", "Qt6", "Qt::AppManInstaller", extra=["COMPONENTS", "AppManInstaller"]
|
||||||
@ -206,8 +206,8 @@ _qt_library_map = [
|
|||||||
LibraryMapping("ivicore", "Qt6", "Qt::IviCore", extra=["COMPONENTS", "IviCore"]),
|
LibraryMapping("ivicore", "Qt6", "Qt::IviCore", extra=["COMPONENTS", "IviCore"]),
|
||||||
LibraryMapping("ivimedia", "Qt6", "Qt::IviMedia", extra=["COMPONENTS", "IviMedia"]),
|
LibraryMapping("ivimedia", "Qt6", "Qt::IviMedia", extra=["COMPONENTS", "IviMedia"]),
|
||||||
LibraryMapping("knx", "Qt6", "Qt::Knx", extra=["COMPONENTS", "Knx"]),
|
LibraryMapping("knx", "Qt6", "Qt::Knx", extra=["COMPONENTS", "Knx"]),
|
||||||
LibraryMapping("kmsconvenience", "Qt6", "Qt::KmsSupport", extra=["COMPONENTS", "KmsSupport"]),
|
LibraryMapping("kmsconvenience", "Qt6", "Qt::KmsSupportPrivate", extra=["COMPONENTS", "KmsSupportPrivate"]),
|
||||||
LibraryMapping("kms_support", "Qt6", "Qt::KmsSupport", extra=["COMPONENTS", "KmsSupport"]),
|
LibraryMapping("kms_support", "Qt6", "Qt::KmsSupportPrivate", extra=["COMPONENTS", "KmsSupportPrivate"]),
|
||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"launcher-lib", "Qt6", "Qt::AppManLauncher", extra=["COMPONENTS", "AppManLauncher"]
|
"launcher-lib", "Qt6", "Qt::AppManLauncher", extra=["COMPONENTS", "AppManLauncher"]
|
||||||
),
|
),
|
||||||
@ -364,7 +364,7 @@ _qt_library_map = [
|
|||||||
LibraryMapping("window-lib", "Qt6", "Qt::AppManWindow", extra=["COMPONENTS", "AppManWindow"]),
|
LibraryMapping("window-lib", "Qt6", "Qt::AppManWindow", extra=["COMPONENTS", "AppManWindow"]),
|
||||||
LibraryMapping("winextras", "Qt6", "Qt::WinExtras", extra=["COMPONENTS", "WinExtras"]),
|
LibraryMapping("winextras", "Qt6", "Qt::WinExtras", extra=["COMPONENTS", "WinExtras"]),
|
||||||
LibraryMapping("x11extras", "Qt6", "Qt::X11Extras", extra=["COMPONENTS", "X11Extras"]),
|
LibraryMapping("x11extras", "Qt6", "Qt::X11Extras", extra=["COMPONENTS", "X11Extras"]),
|
||||||
LibraryMapping("xcb_qpa_lib", "Qt6", "Qt::XcbQpa", extra=["COMPONENTS", "XcbQpa"]),
|
LibraryMapping("xcb_qpa_lib", "Qt6", "Qt::XcbQpaPrivate", extra=["COMPONENTS", "XcbQpaPrivate"]),
|
||||||
LibraryMapping(
|
LibraryMapping(
|
||||||
"xkbcommon_support", "Qt6", "Qt::XkbCommonSupport", extra=["COMPONENTS", "XkbCommonSupport"]
|
"xkbcommon_support", "Qt6", "Qt::XkbCommonSupport", extra=["COMPONENTS", "XkbCommonSupport"]
|
||||||
),
|
),
|
||||||
|
Loading…
Reference in New Issue
Block a user