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>

4 files changed, 29 insertions, 29 deletions

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