6 files changed, 14 insertions, 27 deletions
diff --git a/bin/qt-cmake-create.bat.in b/bin/qt-cmake-create.bat.in
index ff8f7310e9..97faad8db7 100644
--- a/bin/qt-cmake-create.bat.in
+++ b/bin/qt-cmake-create.bat.in
@@ -1,4 +1,5 @@
 @echo off
+setlocal
 :: The directory of this script is the expanded absolute path of the "$qt_prefix/bin" directory.
 set script_dir_path=%~dp0
 
diff --git a/bin/qt-cmake-private-install.cmake.in b/bin/qt-cmake-private-install.cmake.in
index 19dddd4fcb..71a94e190d 100644
--- a/bin/qt-cmake-private-install.cmake.in
+++ b/bin/qt-cmake-private-install.cmake.in
@@ -5,13 +5,18 @@
 # https://gitlab.kitware.com/cmake/cmake/-/issues/20713
 # https://gitlab.kitware.com/cmake/cmake/-/issues/21475
 set(configs "@__qt_configured_configs@")
+set(should_skip_strip "@__qt_skip_strip_installed_artifacts@")
+
 if(NOT QT_BUILD_DIR)
     message(FATAL_ERROR "No QT_BUILD_DIR value provided to qt-cmake-private-install.")
 endif()
-unset(strip_arg)
-if ("x@MSVC@" STREQUAL "x")
-  set(strip_arg --strip)
+
+if(should_skip_strip)
+    unset(strip_arg)
+else()
+    set(strip_arg --strip)
 endif()
+
 foreach(config ${configs})
     message(STATUS "Installing configuration: '${config}'")
     set(args "${CMAKE_COMMAND}" --install ${QT_BUILD_DIR} --config "${config}" ${strip_arg})
diff --git a/bin/qt-cmake.bat.in b/bin/qt-cmake.bat.in
index 96d955d2a9..5d831ebce9 100644
--- a/bin/qt-cmake.bat.in
+++ b/bin/qt-cmake.bat.in
@@ -1,4 +1,5 @@
 @echo off
+setlocal
 :: The directory of this script is the expanded absolute path of the "$qt_prefix/bin" directory.
 set script_dir_path=%~dp0
 
diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in
index f719257f60..14de927c3a 100755
--- a/bin/qt-cmake.in
+++ b/bin/qt-cmake.in
@@ -13,5 +13,7 @@ fi
 
 toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake"
 
+@extra_qt_cmake_code@
+
 # Find the qt toolchain relative to the absolute bin dir path where the script is located.
 exec "$cmake_path" -DCMAKE_TOOLCHAIN_FILE="$toolchain_path" @__qt_cmake_extra@ "$@"
diff --git a/bin/qt-cmake.ios.in b/bin/qt-cmake.ios.in
deleted file mode 100755
index 260da534d3..0000000000
--- a/bin/qt-cmake.ios.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# The directory of this script is the expanded absolute path of the "$qt_prefix/bin" directory.
-script_dir_path=`dirname $0`
-script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
-
-# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.
-original_cmake_path="@CMAKE_COMMAND@"
-cmake_path=$original_cmake_path
-if ! test -f "$cmake_path"; then
-    cmake_path="cmake"
-fi
-
-# Find the qt toolchain relative to the absolute bin dir path where the script is located.
-toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake"
-
-# Specify Xcode as the default generator by assigning it to the CMAKE_GENERATOR env var.
-# An explicit -G or -D CMAKE_GENERATOR given on the command line will still take precedence.
-export CMAKE_GENERATOR=Xcode
-
-# Run cmake.
-exec "$cmake_path" -DCMAKE_TOOLCHAIN_FILE="$toolchain_path" @__qt_cmake_extra@ "$@"
diff --git a/bin/qt-configure-module.bat.in b/bin/qt-configure-module.bat.in
index 10c8ef85fd..26d5c4b051 100644
--- a/bin/qt-configure-module.bat.in
+++ b/bin/qt-configure-module.bat.in
@@ -19,9 +19,9 @@ if not exist "%module_root%\CMakeLists.txt" (
 
 set cmake_scripts_dir=%script_dir_path%\@__relative_path_to_cmake_scripts_dir@
 echo %*>config.opt.in
-call "%script_dir_path%"\qt-cmake.bat -DSKIP_ARGS=1 -DIN_FILE=config.opt.in -DOUT_FILE=config.opt ^
+call "%script_dir_path%\qt-cmake.bat" -DSKIP_ARGS=1 -DIN_FILE=config.opt.in -DOUT_FILE=config.opt ^
     -P "%cmake_scripts_dir%\QtWriteArgsFile.cmake"
-call "%script_dir_path%"\qt-cmake-private.bat -DOPTFILE=config.opt -DMODULE_ROOT="%module_root%" ^
+call "%script_dir_path%\qt-cmake-private.bat" -DOPTFILE=config.opt -DMODULE_ROOT="%module_root%" ^
     -DCMAKE_COMMAND="%script_dir_path%\qt-cmake-private.bat" ^
     -P "%cmake_scripts_dir%\QtProcessConfigureArgs.cmake"
 goto :eof