diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt index e113786e32..e9b87d81b7 100644 --- a/src/platformsupport/devicediscovery/CMakeLists.txt +++ b/src/platformsupport/devicediscovery/CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from devicediscovery.pro. ##################################################################### -## DeviceDiscoverySupport Module: +## DeviceDiscoverySupportPrivate Module: ##################################################################### -qt_internal_add_module(DeviceDiscoverySupport +qt_internal_add_module(DeviceDiscoverySupportPrivate CONFIG_MODULE_NAME devicediscovery_support STATIC INTERNAL_MODULE @@ -23,19 +23,19 @@ qt_internal_add_module(DeviceDiscoverySupport ## Scopes: ##################################################################### -qt_internal_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev +qt_internal_extend_target(DeviceDiscoverySupportPrivate CONDITION QT_FEATURE_libudev SOURCES qdevicediscovery_udev.cpp qdevicediscovery_udev_p.h LIBRARIES 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 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 qdevicediscovery_dummy.cpp qdevicediscovery_dummy_p.h ) diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt index c34b5b3375..280d48058c 100644 --- a/src/platformsupport/fbconvenience/CMakeLists.txt +++ b/src/platformsupport/fbconvenience/CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from fbconvenience.pro. ##################################################################### -## FbSupport Module: +## FbSupportPrivate Module: ##################################################################### -qt_internal_add_module(FbSupport +qt_internal_add_module(FbSupportPrivate CONFIG_MODULE_NAME fb_support STATIC INTERNAL_MODULE diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index 867141fdea..51bbce4a63 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -6,10 +6,10 @@ qt_find_package(Tslib) # 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 STATIC INTERNAL_MODULE @@ -29,7 +29,7 @@ qt_internal_add_module(InputSupport ## Scopes: ##################################################################### -qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev +qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev SOURCES evdevkeyboard/qevdevkeyboard_defaultmap_p.h evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h @@ -42,35 +42,35 @@ qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_evdev 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 evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_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 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 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 PkgConfig::Mtdev ) -qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_tslib +qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_tslib SOURCES tslib/qtslib.cpp tslib/qtslib_p.h PUBLIC_LIBRARIES PkgConfig::Tslib ) -qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput +qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_libinput SOURCES libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h @@ -83,19 +83,19 @@ qt_internal_extend_target(InputSupport CONDITION QT_FEATURE_libinput 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 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 shared/devicehandlerlist_p.h shared/qevdevutil.cpp shared/qevdevutil_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 integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h LIBRARIES diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt index a5b392f733..1c749971c5 100644 --- a/src/platformsupport/kmsconvenience/CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/CMakeLists.txt @@ -3,10 +3,10 @@ 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 STATIC INTERNAL_MODULE diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 201253d6b3..4b11c85bad 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -18,10 +18,10 @@ set(QT_QPA_DEFAULT_EGLFS_INTEGRATION "${_device_integration}" CACHE STRING "Defa # special case end ##################################################################### -## EglFSDeviceIntegration Module: +## EglFSDeviceIntegrationPrivate Module: ##################################################################### -qt_internal_add_module(EglFSDeviceIntegration +qt_internal_add_module(EglFSDeviceIntegrationPrivate INTERNAL_MODULE SOURCES api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h @@ -51,12 +51,12 @@ qt_internal_add_module(EglFSDeviceIntegration ## Scopes: ##################################################################### -qt_internal_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(EglFSDeviceIntegrationPrivate CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) -qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl +qt_internal_extend_target(EglFSDeviceIntegrationPrivate CONDITION QT_FEATURE_opengl SOURCES api/qeglfscontext.cpp api/qeglfscontext_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 # 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 #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 #EGLFS_PREFERRED_PLUGIN= #) @@ -84,7 +84,7 @@ if(QT_FEATURE_cursor) "cursor.json" ) - qt_internal_add_resource(EglFSDeviceIntegration "cursor" + qt_internal_add_resource(EglFSDeviceIntegrationPrivate "cursor" PREFIX "/" FILES diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt index 19169981d1..99bad1b485 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt @@ -1,10 +1,10 @@ # 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 INTERNAL_MODULE SOURCES diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt index 08c313df2c..a20aa173db 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt @@ -1,10 +1,10 @@ # 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 INTERNAL_MODULE SOURCES @@ -26,7 +26,7 @@ qt_internal_add_module(EglFsKmsSupport ) # begin special case -qt_internal_extend_target(EglFsKmsSupport +qt_internal_extend_target(EglFsKmsSupportPrivate CONDITION QNX COMPILE_OPTIONS -fpermissive ) diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 806b76bb72..83f4d5b209 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from xcb.pro. ##################################################################### -## XcbQpa Module: +## XcbQpaPrivate Module: ##################################################################### -qt_internal_add_module(XcbQpa +qt_internal_add_module(XcbQpaPrivate CONFIG_MODULE_NAME xcb_qpa_lib INTERNAL_MODULE NO_MODULE_HEADERS @@ -61,28 +61,28 @@ qt_internal_add_module(XcbQpa ) # special case begin -qt_disable_apple_app_extension_api_only(XcbQpa) +qt_disable_apple_app_extension_api_only(XcbQpaPrivate) # special case end ## Scopes: ##################################################################### -qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_opengl +qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_glib +qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_glib LIBRARIES GLIB2::GLIB2 ) -qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop +qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_draganddrop SOURCES 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 X11::XCB # special case begin @@ -93,30 +93,30 @@ qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib # special case end ) -qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm +qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_xcb_sm SOURCES qxcbsessionmanager.cpp qxcbsessionmanager.h PUBLIC_LIBRARIES ${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 qxcbvulkaninstance.cpp qxcbvulkaninstance.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 ${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 -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 nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_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 ) -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 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 WrapFreetype::WrapFreetype ) # special case begin if(QT_FEATURE_system_xcb_xinput) - qt_internal_extend_target(XcbQpa LIBRARIES XCB::XINPUT) + qt_internal_extend_target(XcbQpaPrivate LIBRARIES XCB::XINPUT) else() set(xinput_source "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/libxcb/xinput.c") set_source_files_properties( "${xinput_source}" PROPERTIES COMPILE_OPTIONS "-w" ) - target_sources(XcbQpa PRIVATE "${xinput_source}") - target_include_directories(XcbQpa PRIVATE + target_sources(XcbQpaPrivate PRIVATE "${xinput_source}") + target_include_directories(XcbQpaPrivate PRIVATE "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/include" ) endif() diff --git a/util/cmake/helper.py b/util/cmake/helper.py index c0063259a9..f22134c5ee 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -129,14 +129,14 @@ _qt_library_map = [ LibraryMapping( "devicediscovery", "Qt6", - "Qt::DeviceDiscoverySupport", - extra=["COMPONENTS", "DeviceDiscoverySupport"], + "Qt::DeviceDiscoverySupportPrivate", + extra=["COMPONENTS", "DeviceDiscoverySupportPrivate"], ), LibraryMapping( "devicediscovery_support", "Qt6", - "Qt::DeviceDiscoverySupport", - extra=["COMPONENTS", "DeviceDiscoverySupport"], + "Qt::DeviceDiscoverySupportPrivate", + extra=["COMPONENTS", "DeviceDiscoverySupportPrivate"], ), LibraryMapping("edid", "Qt6", "Qt::EdidSupport", extra=["COMPONENTS", "EdidSupport"]), LibraryMapping("edid_support", "Qt6", "Qt::EdidSupport", extra=["COMPONENTS", "EdidSupport"]), @@ -144,17 +144,17 @@ _qt_library_map = [ LibraryMapping( "eglfsdeviceintegration", "Qt6", - "Qt::EglFSDeviceIntegration", - extra=["COMPONENTS", "EglFSDeviceIntegration"], + "Qt::EglFSDeviceIntegrationPrivate", + extra=["COMPONENTS", "EglFSDeviceIntegrationPrivate"], ), LibraryMapping( - "eglfs_kms_support", "Qt6", "Qt::EglFsKmsSupport", extra=["COMPONENTS", "EglFsKmsSupport"] + "eglfs_kms_support", "Qt6", "Qt::EglFsKmsSupportPrivate", extra=["COMPONENTS", "EglFsKmsSupportPrivate"] ), LibraryMapping( "eglfs_kms_gbm_support", "Qt6", - "Qt::EglFsKmsGbmSupport", - extra=["COMPONENTS", "EglFsKmsGbmSupport"], + "Qt::EglFsKmsGbmSupportPrivate", + extra=["COMPONENTS", "EglFsKmsGbmSupportPrivate"], ), LibraryMapping("egl_support", "Qt6", "Qt::EglSupport", extra=["COMPONENTS", "EglSupport"]), # enginio: Not needed in Qt6! @@ -170,8 +170,8 @@ _qt_library_map = [ "Qt::EventDispatcherSupport", extra=["COMPONENTS", "EventDispatcherSupport"], ), - LibraryMapping("fbconvenience", "Qt6", "Qt::FbSupport", extra=["COMPONENTS", "FbSupport"]), - LibraryMapping("fb_support", "Qt6", "Qt::FbSupport", extra=["COMPONENTS", "FbSupport"]), + LibraryMapping("fbconvenience", "Qt6", "Qt::FbSupportPrivate", extra=["COMPONENTS", "FbSupportPrivate"]), + LibraryMapping("fb_support", "Qt6", "Qt::FbSupportPrivate", extra=["COMPONENTS", "FbSupportPrivate"]), LibraryMapping( "fontdatabase_support", "Qt6", @@ -195,9 +195,9 @@ _qt_library_map = [ "Qt::HunspellInputMethod", extra=["COMPONENTS", "HunspellInputMethod"], ), - LibraryMapping("input", "Qt6", "Qt::InputSupport", extra=["COMPONENTS", "InputSupport"]), + LibraryMapping("input", "Qt6", "Qt::InputSupportPrivate", extra=["COMPONENTS", "InputSupportPrivate"]), LibraryMapping( - "input_support", "Qt6", "Qt::InputSupport", extra=["COMPONENTS", "InputSupport"] + "input_support", "Qt6", "Qt::InputSupportPrivate", extra=["COMPONENTS", "InputSupportPrivate"] ), LibraryMapping( "installer-lib", "Qt6", "Qt::AppManInstaller", extra=["COMPONENTS", "AppManInstaller"] @@ -206,8 +206,8 @@ _qt_library_map = [ LibraryMapping("ivicore", "Qt6", "Qt::IviCore", extra=["COMPONENTS", "IviCore"]), LibraryMapping("ivimedia", "Qt6", "Qt::IviMedia", extra=["COMPONENTS", "IviMedia"]), LibraryMapping("knx", "Qt6", "Qt::Knx", extra=["COMPONENTS", "Knx"]), - LibraryMapping("kmsconvenience", "Qt6", "Qt::KmsSupport", extra=["COMPONENTS", "KmsSupport"]), - LibraryMapping("kms_support", "Qt6", "Qt::KmsSupport", extra=["COMPONENTS", "KmsSupport"]), + LibraryMapping("kmsconvenience", "Qt6", "Qt::KmsSupportPrivate", extra=["COMPONENTS", "KmsSupportPrivate"]), + LibraryMapping("kms_support", "Qt6", "Qt::KmsSupportPrivate", extra=["COMPONENTS", "KmsSupportPrivate"]), LibraryMapping( "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("winextras", "Qt6", "Qt::WinExtras", extra=["COMPONENTS", "WinExtras"]), 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( "xkbcommon_support", "Qt6", "Qt::XkbCommonSupport", extra=["COMPONENTS", "XkbCommonSupport"] ),