2 files changed, 5 insertions, 2 deletions
diff --git a/bin/qt-configure-module.bat.in b/bin/qt-configure-module.bat.in
index aacb4e6aa32..4c2798c0fbd 100644
--- a/bin/qt-configure-module.bat.in
+++ b/bin/qt-configure-module.bat.in
@@ -53,12 +53,15 @@ set REDO_FILE_PATH=%TOPQTDIR%\config.redo.last
 set REDO_TMP_FILE_PATH=%TOPQTDIR%\config.redo.in
 set FRESH_REQUESTED_ARG=
 if not defined redoing (
+    copy "%script_dir_path%\@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@\@side_car_file_name@" "%OPT_TMP_FILE_PATH%"
+
     rem "The '.' in 'echo.%*' ensures we don't print "echo is off" when no arguments are passed"
     rem "https://devblogs.microsoft.com/oldnewthing/20170802-00/?p=96735"
     rem "The space before the '>' makes sure that when we have a digit at the end of the args, we"
     rem "don't accidentally concatenate it with the '>' resulting in '0>' or '2>' which redirects"
     rem "into the file from a stream different than stdout, leading to broken or empty content."
-    echo.%* >"%OPT_TMP_FILE_PATH%"
+    echo.%* >>"%OPT_TMP_FILE_PATH%"
+    echo.@__extra_configure_args@ >>"%OPT_TMP_FILE_PATH%"
 
     rem "The SKIP_ARGS option makes sure not to write the repo path into the config.opt file"
     call "%script_dir_path%\qt-cmake-private.bat" -DSKIP_ARGS=1 -DIN_FILE="%OPT_TMP_FILE_PATH%" ^
diff --git a/bin/qt-configure-module.in b/bin/qt-configure-module.in
index 690fc014782..0c4e4f77a67 100755
--- a/bin/qt-configure-module.in
+++ b/bin/qt-configure-module.in
@@ -73,7 +73,7 @@ qt_cmake_private_path="$script_dir_path/../@INSTALL_LIBEXECDIR@"
 
 fresh_requested_arg=
 if [ -z "$optfile" ]; then   # only write optfile if not currently redoing
-    > "$opttmpfilepath"
+    cp "$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/@side_car_file_name@" "$opttmpfilepath"
     > "$redotmpfilepath"
 
     for arg in "$@"; do echo \"$arg\" >> "$opttmpfilepath"; done