Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

This changes many different CMake places to mention Qt6 instead of
Qt5.

Note that some old qt5 cmake config files in corelib are probably not
needed anymore, but I still renamed and kept them for now.

Change-Id: Ie69e81540386a5af153f76c0242e18d48211bec4

9 files changed, 17 insertions, 17 deletions

diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
index 6c5c7e1951..05a41ee3e7 100644
--- a/cmake/QtBaseGlobalTargets.cmake
+++ b/cmake/QtBaseGlobalTargets.cmake
@@ -21,7 +21,7 @@ set(__GlobalConfig_path_suffix "${INSTALL_CMAKE_NAMESPACE}")
 qt_path_join(__GlobalConfig_build_dir ${QT_CONFIG_BUILD_DIR} ${__GlobalConfig_path_suffix})
 qt_path_join(__GlobalConfig_install_dir ${QT_CONFIG_INSTALL_DIR} ${__GlobalConfig_path_suffix})
 
-# Generate and install Qt5 config file.
+# Generate and install Qt6 config file.
 configure_package_config_file(
     "${PROJECT_SOURCE_DIR}/cmake/QtConfig.cmake.in"
     "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}Config.cmake"
@@ -34,7 +34,7 @@ write_basic_package_version_file(
     COMPATIBILITY AnyNewerVersion
 )
 
-# Generate and install Qt5Tools config file.
+# Generate and install Qt6Tools config file.
 configure_package_config_file(
     "${PROJECT_SOURCE_DIR}/cmake/QtToolsConfig.cmake.in"
     "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ToolsConfig.cmake"
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 9f358d164d..a09cdf1f64 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -675,7 +675,7 @@ endfunction()
 # When doing qt_internal_module_info(foo Core) this method will set
 # the following variables in the caller's scope:
 #  * foo with the value "QtCore"
-#  * foo_versioned with the value "Qt5Core" (based on major Qt version)
+#  * foo_versioned with the value "Qt6Core" (based on major Qt version)
 #  * foo_upper with the value "CORE"
 #  * foo_lower with the value "core"
 #  * foo_include_dir with the module's include directory in the binary tree
@@ -775,7 +775,7 @@ function(qt_register_target_dependencies target public_libs private_libs)
                     OR lib STREQUAL PlatformModuleInternal
                     OR lib STREQUAL PlatformPluginInternal
                     OR lib STREQUAL PlatformToolInternal)
-                list(APPEND target_deps "Qt5\;${PROJECT_VERSION}")
+                list(APPEND target_deps "Qt6\;${PROJECT_VERSION}")
             elseif ("${lib}" MATCHES "(.*)Private")
                 list(APPEND target_deps "${INSTALL_CMAKE_NAMESPACE}${CMAKE_MATCH_1}\;${PROJECT_VERSION}")
             else()
@@ -1250,8 +1250,8 @@ function(add_qt_module target)
 
     if(target STREQUAL Core)
         # Propagate non-build related variables that are needed for consuming Qt packages.
-        # Do this in CoreConfig instead of Qt5Config, so that consumers can also use
-        # find_package(Qt5Core) instead of find_package(Qt5 COMPONENTS Core)
+        # Do this in CoreConfig instead of Qt6Config, so that consumers can also use
+        # find_package(Qt6Core) instead of find_package(Qt6 COMPONENTS Core)
         string(APPEND extra_cmake_code "
 set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
     endif()
@@ -1718,7 +1718,7 @@ function(add_qt_tool name)
     endif()
 
     if(arg_TOOLS_TARGET AND NOT QT_WILL_BUILD_TOOLS)
-        set(tools_package_name "Qt5${arg_TOOLS_TARGET}Tools")
+        set(tools_package_name "Qt6${arg_TOOLS_TARGET}Tools")
         message(STATUS "Searching for tool '${full_name}' in package ${tools_package_name}.")
 
         # Only search in path provided by QT_HOST_PATH. We need to do it with CMAKE_PREFIX_PATH
@@ -1728,7 +1728,7 @@ function(add_qt_tool name)
         set(CMAKE_PREFIX_PATH "${QT_HOST_PATH}")
 
         # Search both with sysroots prepended as well as in the host system. When cross compiling
-        # the mode_package might be set to ONLY only, and the Qt5 tools packages are actually
+        # the mode_package might be set to ONLY only, and the Qt6 tools packages are actually
         # in the host system.
         set(BACKUP_CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${CMAKE_FIND_ROOT_PATH_MODE_PACKAGE})
         set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE "BOTH")
@@ -1944,7 +1944,7 @@ function(add_qt_simd_part target)
     endif()
 endfunction()
 
-# From Qt5CoreMacros
+# From Qt6CoreMacros
 # Function used to create the names of output files preserving relative dirs
 function(qt_make_output_file infile prefix suffix source_dir binary_dir result)
     get_filename_component(outfilename "${infile}" NAME_WE)
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index b2b262d05c..8a6c2cb733 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -73,7 +73,7 @@ macro(qt_build_repo)
     # Do this before adding src, because there might be test related conditions
     # in source.
     if (BUILD_TESTING)
-        find_package(Qt5 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Test)
+        find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Test)
     endif()
 
     if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists.txt")
diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in
index 0ea33214eb..1212c191b9 100644
--- a/cmake/QtConfig.cmake.in
+++ b/cmake/QtConfig.cmake.in
@@ -1,6 +1,6 @@
 @PACKAGE_INIT@
 
-# Slightly amended version of ./src/corelib/Qt5Config.cmake.in
+# Slightly amended version of ./src/corelib/Qt6Config.cmake.in
 if (CMAKE_VERSION VERSION_LESS 3.1.0)
     message(FATAL_ERROR "Qt requires at least CMake version 3.1.0")
 endif()
diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in
index 5d9164bd11..e6855de528 100644
--- a/cmake/QtModuleDependencies.cmake.in
+++ b/cmake/QtModuleDependencies.cmake.in
@@ -46,7 +46,7 @@ foreach(_target_dep ${_tool_deps})
     endif()
 endforeach()
 
-# note: target_deps example: "Qt5Core\;5.12.0;Qt5Gui\;5.12.0"
+# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
 set(_target_deps "@target_deps@")
 foreach(_target_dep ${_target_deps})
     list(GET _target_dep 0 pkg)
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake
index 1d601e684b..70768947a0 100644
--- a/cmake/QtPlatformAndroid.cmake
+++ b/cmake/QtPlatformAndroid.cmake
@@ -162,12 +162,12 @@ function(qt_android_generate_deployment_settings target)
 
     # Host Qt Android  install path
     if (NOT QT_BUILDING_QT)
-        set(file_check "${Qt5_DIR}/plugins/platforms/android/libqtforandroid.so")
+        set(file_check "${Qt6_DIR}/plugins/platforms/android/libqtforandroid.so")
         if (NOT EXISTS ${file_check})
             message(SEND_ERROR "Detected Qt installation does not contain libqtforandroid.so. This is most likely due to the installation not being a build of Qt for Android. Please update your settings.")
             return()
         endif()
-        set(qt_android_install_dir ${Qt5_Dir})
+        set(qt_android_install_dir ${Qt6_Dir})
     else()
         # Building from source, use the same install prefix
         set(qt_android_install_dir ${CMAKE_INSTALL_PREFIX})
diff --git a/cmake/QtPluginDependencies.cmake.in b/cmake/QtPluginDependencies.cmake.in
index 0b0db32ca1..b456db58c1 100644
--- a/cmake/QtPluginDependencies.cmake.in
+++ b/cmake/QtPluginDependencies.cmake.in
@@ -34,7 +34,7 @@ endforeach()
 # Restore old module path.
 set(CMAKE_MODULE_PATH "${old_CMAKE_MODULE_PATH}")
 
-# note: target_deps example: "Qt5Core\;5.12.0;Qt5Gui\;5.12.0"
+# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
 set(_target_deps "@target_deps@")
 foreach(_target_dep ${_target_deps})
     list(GET _target_dep 0 pkg)
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
index 3277a1af35..2e8f78242b 100644
--- a/cmake/QtSetup.cmake
+++ b/cmake/QtSetup.cmake
@@ -17,7 +17,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 # Appends a 'debug postfix' to library targets (not executables)
-# e.g. lib/libQt5DBus_debug.5.12.0.dylib
+# e.g. lib/libQt6DBus_debug.5.12.0.dylib
 if(WIN32)
     set(CMAKE_DEBUG_POSTFIX "d")
 elseif(APPLE)
diff --git a/cmake/README.md b/cmake/README.md
index bf878800d6..01efe221cf 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -60,7 +60,7 @@ CMake has a ninja backend that works quite well and is noticeably faster than ma
     cmake --build . # ... or ninja ;-)
 ```
 
-You can look into the generated ``build.ninja`` file if you're curious and you can also build targets directory such as ``ninja lib/libQt5Core.so``.
+You can look into the generated ``build.ninja`` file if you're curious and you can also build targets directory such as ``ninja lib/libQt6Core.so``.
 
 When you're done with the build, you may want to install it, using ``ninja install`` or ``make install``. The installation prefix is chosen when running cmake though: