Commit: f4a8bae9281d2fed475dfd5eaa8916ede263d263 - Fs-scripts (git)

Commit MetaInfo

• Revision: f4a8bae9281d2fed475dfd5eaa8916ede263d263 (tree)
• Time: 2022-08-15 23:20:33
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

FINALLY make use of CompilerVer.lua (Tested on Windows)

Change Summary

• modified: Compile/lib/CompilerVer.lua
• modified: Compile/lib/Configuration.lua
• modified: Compile/lib/opensslCompile/conf.lua
• modified: Compile/lib/qtCompile/conf.lua

Incremental Difference

--- a/Compile/lib/CompilerVer.lua
+++ b/Compile/lib/CompilerVer.lua
@@ -53,7 +53,7 @@ local runShScript = function(script)
 	return ret
 end
 
-compilerVer.msvc = function(envBat)
+compilerVer.msvc = function(isWin, envBat)
 	local shellScript = "@call \"" .. envBat .. "\" > NUL\r\n@echo %VSCMD_VER%\r\n"
 	local ret = runCmdScript(shellScript)
 	return parseVersionNum(ret)

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -1,5 +1,7 @@
 local conf = {}
 
+local compilerVer = require("CompilerVer")
+
 conf.host = {}
 
 conf.host.win = {
@@ -74,6 +76,7 @@ conf.host.win = {
 		["2"] = "D:\\Python27",
 		["3"] = "D:\\Python39",
 	},
+	["defaultToolchainExecutableName"] = "gcc",
 }
 
 -- msys is treated as another host since it uses windows agent and unix shell
@@ -102,6 +105,7 @@ conf.host.msys = {
 		["r23c"] = "/d/android-ndk-r23c/",
 	},
 	["androidNdkHost"] = "windows-x86_64",
+	["defaultToolchainExecutableName"] = "gcc",
 }
 
 conf.host.linux = {
@@ -130,6 +134,7 @@ conf.host.linux = {
 		["2.0.14"] = "/opt/env/emsdk-2.0.14/",
 		["3.0.0"] = "/opt/env/emsdk-3.0.0/",
 	},
+	["defaultToolchainExecutableName"] = "gcc",
 }
 
 conf.host.mac = {
@@ -156,6 +161,7 @@ conf.host.mac = {
 		["2.0.14"] = "/opt/env/emsdk-2.0.14/",
 		["3.0.0"] = "/opt/env/emsdk-3.0.0/",
 	},
+	["defaultToolchainExecutableName"] = "clang",
 }
 
 conf.host.macLegacy = {
@@ -176,10 +182,22 @@ conf.host.macLegacy = {
 	["emscriptenPath"] = {
 		["1.39.8"] = "/opt/env/emsdk-1.39.8/",
 	},
+	["defaultToolchainExecutableName"] = "clang",
 }
 
 --[[ conf.host.linuxarm = {} ]] -- Todo: Prepare an arm linux host. It should be hosted on my old mobile phone, I assumed, or raspi?
 
+local replaceVersion = function(input, hostToolchainVersion, targetToolchainVersion)
+	local output = input
+	if hostToolchainVersion then
+		output = string.gsub(output, "%&HOSTTOOLVERSION%&", tostring(hostToolchainVersion))
+	end
+	if targetToolchainVersion then
+		output = string.gsub(output, "%&TARGETTOOLVERSION%&", tostring(targetToolchainVersion))
+	end
+	return output
+end
+
 conf.Qt = {}
 
 conf.Qt.configurations = dofile(scriptPath .. "/lib/qtCompile/conf.lua")
@@ -201,21 +219,33 @@ conf.Qt.generateConfTable = function(self, host, job)
 	-- dirty hack end
 	ret.BUILDDIR = confHost.buildRootPath .. "build-Qt" .. job
 	ret.download = {}
+	
+	-- DO REMEMBER TO USE tostring IF A VERSION STRING IS NEEDED!!
+	local hostToolchainVersion, targetToolchainVersion
+	local hostToolchainVersionQueryFuncName = "gcc"
+	local hostToolchainVersionQueryPath
+	local hostToolchainExecutableName = confHost.defaultToolchainExecutableName
 
 	if confDetail.toolchain ~= "PATH" then
 		local paths = confHost.toolchainPath[confDetail.toolchain]
 		if type(confHost.toolchainPath[confDetail.toolchain]) == "string" then
 			paths = {confHost.toolchainPath[confDetail.toolchain]}
 		end
+		hostToolchainVersionQueryPath = paths[1]
 		if string.sub(confDetail.toolchain, 1, 4) == "MSVC" then
+			hostToolchainVersionQueryFuncName = "msvc"
 			ret.msvcBat = paths[1]
 			table.remove(paths, 1)
+		elseif string.sub(confDetail.toolchain, 1, 4) == "MinGWLLVM" then
+			hostToolchainExecutableName = "clang"
 		end
 		for _, x in ipairs(paths) do
 			table.insert(ret.path, x)
 		end
 	end
 
+	hostToolchainVersion = compilerVer[hostToolchainVersionQueryFuncName](confHost.makefileTemplate == "win", hostToolchainVersionQueryPath, hostToolchainExecutableName)
+
 	if confDetail.useCMake and confHost.cMakePath then
 		for _, p in ipairs(confHost.cMakePath[confDetail.useCMake]) do
 			table.insert(ret.path, p)
@@ -223,27 +253,15 @@ conf.Qt.generateConfTable = function(self, host, job)
 	end
 
 	ret.envSet = {}
-
-	local repl = {}
-
 	ret.date = string.format("%04d%02d%02d", BuildTime.year, BuildTime.month, BuildTime.day)
-	local installFolderName =  confDetail.name
-	local installRoot = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. installFolderName
-
-	if confDetail.opensslConf then
-		table.insert(ret.download, conf.OpenSSL:binaryFileDownloadPath(host, confDetail.opensslConf))
-		repl.OPENSSLDIR = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. conf.OpenSSL.configurations[confDetail.opensslConf].name
-		if confDetail.OPENSSL_LIBS then
-			local opensslLibs = string.gsub(confDetail.OPENSSL_LIBS, "%&OPENSSLDIR%&", repl.OPENSSLDIR)
-			ret.envSet.OPENSSL_LIBS = opensslLibs
-		end
-	end
 
+	local repl = {}
+	
 	if confDetail.crossCompile then
 		-- Qt 6: We need host tool to cross build Qt
 		if confDetail.hostToolsConf then
-			table.insert(ret.download, confDetail["hostToolsUrl" .. confHost.makefileTemplate])
-			repl.HOSTQTDIR = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. conf.Qt.configurations[confDetail.hostToolsConf].name
+			table.insert(ret.download, conf.Qt:hostToolDownloadPath(confHost, job, hostToolchainVersion))
+			repl.HOSTQTDIR = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep ..replaceVersion(conf.Qt.configurations[confDetail.hostToolsConf].name, hostToolchainVersion)
 		end
 
 		if string.sub(confDetail.toolchainT, 1, 7) == "Android" then -- Android
@@ -271,10 +289,13 @@ conf.Qt.generateConfTable = function(self, host, job)
 			if emsdkVer then
 				-- Since emsdk doesn't provide a way for downgrade, we have to split each emsdk installation.
 				-- Currently all emsdk version we are using can be simply matched using only its version number, so ...
+				-- TODO: remove ret.emBat and use ret.emSource also for Windows
 				ret.emBat = confHost.emscriptenPath[emsdkVer] .. "emsdk activate " .. emsdkVer
 				if confHost.makefileTemplate == "unix" then
 					ret.emSource = confHost.emscriptenPath[emsdkVer] .. "/emsdk_env.sh"
 				end
+				
+				targetToolchainVersion = compilerVer.emcc(confHost.makefileTemplate == "win", confHost.emscriptenPath[emsdkVer])
 			else
 				error("WebAssembly - confDetail.toolchainT is not matched")
 			end
@@ -285,8 +306,21 @@ conf.Qt.generateConfTable = function(self, host, job)
 		elseif string.sub(confDetail.toolchainT, 1, 5) == "MinGW" then -- MinGW cross builds(Todo)
 			error("todo....")
 		end
+	else
+		targetToolchainVersion = hostToolchainVersion
 	end
 
+	if confDetail.opensslConf then
+		table.insert(ret.download, conf.OpenSSL:binaryFileDownloadPath(confHost, confDetail.opensslConf, targetToolchainVersion))
+		repl.OPENSSLDIR = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. replaceVersion(conf.OpenSSL.configurations[confDetail.opensslConf].name, nil, targetToolchainVersion)
+		if confDetail.OPENSSL_LIBS then
+			local opensslLibs = string.gsub(confDetail.OPENSSL_LIBS, "%&OPENSSLDIR%&", repl.OPENSSLDIR)
+			ret.envSet.OPENSSL_LIBS = opensslLibs
+		end
+	end
+
+	local installFolderName = replaceVersion(confDetail.name, hostToolchainVersion, targetToolchainVersion)
+	local installRoot = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. installFolderName
 	repl.INSTALLROOT = installRoot
 
 	local sourcePackageBaseName = confDetail.sourcePackageBaseName
@@ -325,7 +359,7 @@ conf.Qt.generateConfTable = function(self, host, job)
 			error("not supported")
 		end
 	else
-		-- let CMake call the underlayer make tool
+		-- let CMake call the underlying make tool
 		ret.MAKE = "cmake --build . --parallel -- "
 	end
 	if (string.sub(confDetail.qtVersion, 1, 2) == "6.") and confDetail.crossCompile and (string.sub(confDetail.toolchainT, 1, 10) == "emscripten") then
@@ -333,7 +367,7 @@ conf.Qt.generateConfTable = function(self, host, job)
 	end
 
 	-- For whatever reason Python can't be in PATH in Windows.
-	-- Python for windows has its executable versionless. We need to prepend its path to the PATH valuable.
+	-- Python for windows has its executable versionless. We need to prepend its path to the PATH variable.
 	if confHost.pythonPath then
 		if string.sub(confDetail.qtVersion, 1, 2) == "6." then
 			table.insert(ret.path, confHost.pythonPath["3"])
@@ -432,6 +466,11 @@ conf.Qt.generateConfTable = function(self, host, job)
 	return ret, qQtPatcherTable
 end
 
+conf.Qt.hostToolDownloadPath = function(self, confHost, job, version)
+	local pathWithVersionNotSubstituted = conf.Qt.configurations[job]["hostToolsUrl" .. confHost.makefileTemplate]
+	return replaceVersion(pathWithVersionNotSubstituted, version)
+end
+
 conf.OpenSSL = {}
 
 conf.OpenSSL.configurations = dofile(scriptPath .. "/lib/opensslCompile/conf.lua")
@@ -452,7 +491,7 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 	ret.download = {}
 
 	if confDetail.opensslAndroidAll then
-		-- currently this part of script runs only on CentOS8 and no windows compatible is made.
+		-- currently this part of script runs only on whatever Linux host (CentOS8 on my build environment) and no Windows compatibility is made.
 		-- no plan for Windows support.
 		ret.buildContent = "OpenSSLAndroidAll"
 		ret.INSTALLROOT = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. confDetail.name
@@ -463,7 +502,7 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 		repl.arch = {}
 
 		for arch, androidConf in pairs(confDetail.opensslAndroidAll) do
-			table.insert(ret.download, conf.OpenSSL:binaryFileDownloadPath(host, androidConf))
+			table.insert(ret.download, conf.OpenSSL:binaryFileDownloadPath(confHost, androidConf))
 			ret.OPENSSLDIRFUNCTION = ret.OPENSSLDIRFUNCTION .. "if [ \"x$1\" = \"x" .. arch .. "\" ]; then\n" .. "CURRENTARCHDIR=\"" .. conf.OpenSSL.configurations[androidConf].name .. "\"\nexport CURRENTARCHDIR\nel"
 			table.insert(repl.arch, arch)
 		end
@@ -480,30 +519,37 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 		ret.INSTALLCOMMANDLINE = " "
 		table.insert(ret.download, confDetail["sourcePackageUrl" .. confHost.makefileTemplate])
 
+		-- DO REMEMBER TO USE tostring IF A VERSION STRING IS NEEDED!!
+		local hostToolchainVersion, targetToolchainVersion
+		local hostToolchainVersionQueryFuncName = "gcc"
+		local hostToolchainVersionQueryPath
+		local hostToolchainExecutableName = confHost.defaultToolchainExecutableName
+
 		if confDetail.toolchain ~= "PATH" then
 			local paths = confHost.toolchainPath[confDetail.toolchain]
 			if type(confHost.toolchainPath[confDetail.toolchain]) == "string" then
 				paths = {confHost.toolchainPath[confDetail.toolchain]}
 			end
+			hostToolchainVersionQueryPath = paths[1]
 			if string.sub(confDetail.toolchain, 1, 4) == "MSVC" then
+				hostToolchainVersionQueryFuncName = "msvc"
 				ret.msvcBat = paths[1]
 				table.remove(paths, 1)
+			elseif string.sub(confDetail.toolchain, 1, 4) == "MinGWLLVM" then
+				hostToolchainExecutableName = "clang"
 			end
 			for _, x in ipairs(paths) do
 				table.insert(ret.path, x)
 			end
 		end
 
+		hostToolchainVersion = compilerVer[hostToolchainVersionQueryFuncName](confHost.makefileTemplate == "win", hostToolchainVersionQueryPath, hostToolchainExecutableName)
+
 		ret.envSet = {}
 
 		local repl = {}
 		repl.parameter = {}
 
-		local installFolderName =  confDetail.name
-		local installRoot = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. installFolderName
-
-		repl.INSTALLROOT = installRoot
-
 		if confDetail.crossCompile then
 			if string.sub(confDetail.toolchainT, 1, 7) == "Android" then -- Android
 				-- Let's use NDK package directly
@@ -533,6 +579,7 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 				error("not supported")
 			end
 		else
+			targetToolchainVersion = hostToolchainVersion
 			if string.sub(confDetail.toolchain, 1, 4) == "MSVC" then -- if conf.hostToConfMap[host] == "win" then
 				-- nothing special
 			elseif string.sub(confDetail.toolchain, 1, 5) == "MinGW" then -- elseif conf.hostToConfMap[host] == "msys" then
@@ -542,7 +589,7 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 				end
 			elseif string.sub(conf.hostToConfMap[host], 1, 3) == "mac" then
 				-- OpenSSL build for macOS is not used when building Qt 5. Since build of Qt 4 has been defuncted, this may also be defuncted.
-				-- But OpenSSL is revived in Qt 6! Seems Strange? It's because that SecureTransport has been deprecated by Apple and won't support TLS 1.3!
+				-- But you know what? OpenSSL is revived in Qt 6! Seems Strange? It's because that SecureTransport has been deprecated by Apple and won't support TLS 1.3!
 				-- Currently only OpenSSL 3 is building. Since macOS comes with 2 different archtectures, we should distinguish them using CC environment variable
 				ret.envSet.CC = "clang -arch " .. ((host ~= "macOSM1") and "x86_64" or "arm64")
 			else
@@ -550,6 +597,11 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 			end
 		end
 
+		local installFolderName = replaceVersion(confDetail.name, nil, targetToolchainVersion)
+		local installRoot = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. installFolderName
+
+		repl.INSTALLROOT = installRoot
+
 		local configureArgs = ""
 		for _, p in ipairs(repl.parameter) do
 			configureArgs = configureArgs .. " " .. p
@@ -565,14 +617,14 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 		end), "%s+", " ")
 
 		if confHost.makefileTemplate == "unix" then
-			-- OpenSSL on MinGW is using MSYS2, so only runs on Unix environment
+			-- OpenSSL on MinGW is built using MSYS2, so only runs on Unix environment
 			ret.MAKE = "make -j$PARALLELNUM"
 			ret.INSTALLCOMMANDLINE = ret.MAKE .. " install_sw install_ssldirs " .. ret.INSTALLCOMMANDLINE
 		elseif string.sub(confDetail.toolchain, 1, 4) == "MSVC" then
 			-- MSVC version of Makefile supports only nmake, jom is not supported offically
 			-- some pull requests which tries to support jom on MSVC builds are simply closed.
 			-- OpenSSL maintainers said that cmake can't cover their supported platforms, so they use a custom build system.
-			-- It seems reasonable but is not the reason why they don't support a 'speed-boosting drop-in replacement' make tool with just a few workarounds.
+			-- It seems reasonable but is not the reason why they don't accept modifications about a 'speed-boosting drop-in replacement' make tool with just a few workarounds.
 
 			-- currently adding "/FS" to the compiler command line, but it fails randomly.
 			-- Retry is added when build fails, for 3 times.
@@ -585,14 +637,14 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 		end
 
 		ret.INSTALLROOT = installRoot
-		ret.INSTALLPATH = confDetail.name
+		ret.INSTALLPATH = installFolderName
 	end
 	return ret
 end
 
-conf.OpenSSL.binaryFileDownloadPath = function(self, host, job)
-	local confHost = conf.host[conf.hostToConfMap[host]]
-	return conf.OpenSSL.configurations[job]["binaryPackageUrl" .. confHost.makefileTemplate]
+conf.OpenSSL.binaryFileDownloadPath = function(self, confHost, job, version)
+	local pathWithVersionNotSubstituted = conf.OpenSSL.configurations[job]["binaryPackageUrl" .. confHost.makefileTemplate]
+	return replaceVersion(pathWithVersionNotSubstituted, nil, version)
 end
 
 conf.buildContent = function(self, buildJob)

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -97,7 +97,7 @@ conf.o1wx6v5 = {
 --------------------------------------------------------------------
 
 conf.o1wx3m7 = {
-	name = "OpenSSL1.1.1q-Windows-x86-MinGW-GCC7.3.0",
+	name = "OpenSSL1.1.1q-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&",
 	opensslVersion = "1.1.1q",
 	host = "Win8SH",
 	toolchain = "MinGW730-32",
@@ -113,7 +113,7 @@ conf.o1wx3m7 = {
 }
 
 conf.o1wx6m7 = {
-	name = "OpenSSL1.1.1q-Windows-x86_64-MinGW-GCC7.3.0",
+	name = "OpenSSL1.1.1q-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
 	opensslVersion = "1.1.1q",
 	host = "Win8SH",
 	toolchain = "MinGW730-64",
@@ -131,7 +131,7 @@ conf.o1wx6m7 = {
 --------------------------------------------------------------------
 
 conf.o1wx3v7 = {
-	name = "OpenSSL1.1.1q-Windows-x86-VS2017-&MSVCVER&",
+	name = "OpenSSL1.1.1q-Windows-x86-VS2017-&TARGETTOOLVERSION&",
 	opensslVersion = "1.1.1q",
 	host = "Win10",
 	toolchain = "MSVC2017-32",
@@ -147,7 +147,7 @@ conf.o1wx3v7 = {
 }
 
 conf.o1wx3v7st = {
-	name = "OpenSSL1.1.1q-Windows-x86-VS2017-&MSVCVER&-static",
+	name = "OpenSSL1.1.1q-Windows-x86-VS2017-&TARGETTOOLVERSION&-static",
 	opensslVersion = "1.1.1q",
 	host = "Win10",
 	toolchain = "MSVC2017-32",
@@ -164,7 +164,7 @@ conf.o1wx3v7st = {
 }
 
 conf.o1wx6v7 = {
-	name = "OpenSSL1.1.1q-Windows-x86_64-VS2017-&MSVCVER&",
+	name = "OpenSSL1.1.1q-Windows-x86_64-VS2017-&TARGETTOOLVERSION&",
 	opensslVersion = "1.1.1q",
 	host = "Win10",
 	toolchain = "MSVC2017-64",
@@ -180,7 +180,7 @@ conf.o1wx6v7 = {
 }
 
 conf.o1wx6v7st = {
-	name = "OpenSSL1.1.1q-Windows-x86_64-VS2017-&MSVCVER&-static",
+	name = "OpenSSL1.1.1q-Windows-x86_64-VS2017-&TARGETTOOLVERSION&-static",
 	opensslVersion = "1.1.1q",
 	host = "Win10",
 	toolchain = "MSVC2017-64",
@@ -199,7 +199,7 @@ conf.o1wx6v7st = {
 --------------------------------------------------------------------
 
 conf.o1wx3v9 = {
-	name = "OpenSSL1.1.1q-Windows-x86-VS2019-&MSVCVER&",
+	name = "OpenSSL1.1.1q-Windows-x86-VS2019-&TARGETTOOLVERSION&",
 	opensslVersion = "1.1.1q",
 	host = "Win10",
 	toolchain = "MSVC2019-32",
@@ -215,7 +215,7 @@ conf.o1wx3v9 = {
 }
 
 conf.o1wx6v9 = {
-	name = "OpenSSL1.1.1q-Windows-x86_64-VS2019-&MSVCVER&",
+	name = "OpenSSL1.1.1q-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
 	opensslVersion = "1.1.1q",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -334,7 +334,7 @@ conf.o1aalnl = {
 -- OpenSSL 3.0.5
 
 conf.o3wx6v9 = {
-	name = "OpenSSL3.0.5-Windows-x86_64-VS2019-&MSVCVER&",
+	name = "OpenSSL3.0.5-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
 	opensslVersion = "3.0.5",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -350,7 +350,7 @@ conf.o3wx6v9 = {
 }
 
 conf.o3wx6v9st = {
-	name = "OpenSSL3.0.5-Windows-x86_64-VS2019-&MSVCVER&-static",
+	name = "OpenSSL3.0.5-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static",
 	opensslVersion = "3.0.5",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -367,7 +367,7 @@ conf.o3wx6v9st = {
 }
 
 conf.o3wx6v2 = {
-	name = "OpenSSL3.0.5-Windows-x86_64-VS2022-&MSVCVER&",
+	name = "OpenSSL3.0.5-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
 	opensslVersion = "3.0.5",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
@@ -383,7 +383,7 @@ conf.o3wx6v2 = {
 }
 
 conf.o3wx6v2st = {
-	name = "OpenSSL3.0.5-Windows-x86_64-VS2022-&MSVCVER&-static",
+	name = "OpenSSL3.0.5-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static",
 	opensslVersion = "3.0.5",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
@@ -402,7 +402,7 @@ conf.o3wx6v2st = {
 --------------------------------------------------------------------
 
 conf.o3wx6m1 = {
-	name = "OpenSSL3.0.5-Windows-x86_64-MinGW-GCC11.2.0",
+	name = "OpenSSL3.0.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
 	opensslVersion = "3.0.5",
 	host = "Win10SH",
 	toolchain = "MinGW1120-64",
@@ -419,7 +419,7 @@ conf.o3wx6m1 = {
 }
 
 conf.o3wx6m2 = {
-	name = "OpenSSL3.0.5-Windows-x86_64-MinGW-GCC12.1.0",
+	name = "OpenSSL3.0.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
 	opensslVersion = "3.0.5",
 	host = "Win10SH",
 	toolchain = "MinGW1210-64",
@@ -438,7 +438,7 @@ conf.o3wx6m2 = {
 -- Note: Current instruction by "o*wx6mu" has nowhere to indicate that this is an LLVM-based toolchain.
 -- Note: Future version of this build configuration should be called "o*wx6Lu" where "L" means LLVM-based toolchain.
 conf.o3wx6mu = {
-	name = "OpenSSL3.0.5-Windows-x86_64-llvm-mingw-14.0.0-ucrt",
+	name = "OpenSSL3.0.5-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
 	opensslVersion = "3.0.5",
 	host = "Win10SH",
 	toolchain = "MinGWLLVM-ucrt14-64",
@@ -458,7 +458,7 @@ conf.o3wx6mu = {
 -- Note: Current instruction by "o*wx6mv" has nowhere to indicate that this is an LLVM-based toolchain.
 -- Note: Future version of this build configuration should be called "o*wx6Lv" where "L" means LLVM-based toolchain.
 conf.o3wx6mv = {
-	name = "OpenSSL3.0.5-Windows-x86_64-llvm-mingw-14.0.0-msvcrt",
+	name = "OpenSSL3.0.5-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
 	opensslVersion = "3.0.5",
 	host = "Win10SH",
 	toolchain = "MinGWLLVM-msvcrt14-64",
@@ -478,7 +478,7 @@ conf.o3wx6mv = {
 --------------------------------------------------------------------
 
 conf.o3mx6 = {
-	name = "OpenSSL3.0.5-macOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "OpenSSL3.0.5-macOS-x86_64-AppleClang&TARGETTOOLVERSION&",
 	opensslVersion = "3.0.5",
 	host = "macOS1015",
 	libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
@@ -494,7 +494,7 @@ conf.o3mx6 = {
 }
 
 conf.o3ma6 = {
-	name = "OpenSSL3.0.5-macOS-arm64_v8a-AppleClang&AppleClangVersion&",
+	name = "OpenSSL3.0.5-macOS-arm64_v8a-AppleClang&TARGETTOOLVERSION&",
 	opensslVersion = "3.0.5",
 	host = "macOSM1",
 	libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
@@ -610,19 +610,6 @@ conf.o3aaln324 = {
 
 --------------------------------------------------------------------
 
-local MsvcVer = {
-	["MSVC2015"] = "14",
-	["MSVC2017"] = "15.9.49",
-	["MSVC2019"] = "16.11.16",
-	["MSVC2022"] = "17.2.4",
-}
-
-local AppleClangVersion = {
-	["macOS1015"] = "13.1.6",
-	["macOSM1"] = "13.1.6",
-	["macOSLegacy"] = "12.0.5",
-}
-
 for name, value in pairs(conf) do
 	-- sanity check
 	if value.name == nil then
@@ -646,14 +633,6 @@ for name, value in pairs(conf) do
 	if not value.toolchain then
 		value.toolchain = "PATH"
 	end
-
-	-- hack MSVCVER into name
-	if string.sub(value.toolchain, 1, 4) == "MSVC" then
-		value.name = string.gsub(value.name, "%&MSVCVER%&", MsvcVer[string.sub(value.toolchain, 1, 8)])
-	end
-	if string.find(value.name, "AppleClang") then
-		value.name = string.gsub(value.name, "%&AppleClangVersion%&", AppleClangVersion[value.host])
-	end
 end
 
 local valueMo = {

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -234,7 +234,7 @@ conf.Q2wx6v5 = {
 }
 
 conf.Q2wx3v7 = {
-	name = "Qt5.12.12-Windows-x86-VS2017-&MSVCVER&",
+	name = "Qt5.12.12-Windows-x86-VS2017-&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "Win10",
 	toolchain = "MSVC2017-32",
@@ -274,7 +274,7 @@ conf.Q2wx3v7 = {
 }
 
 conf.Q2wx3v7st = {
-	name = "Qt5.12.12-Windows-x86-VS2017-&MSVCVER&-static",
+	name = "Qt5.12.12-Windows-x86-VS2017-&HOSTTOOLVERSION&-static",
 	qtVersion = "5.12.12",
 	host = "Win10",
 	toolchain = "MSVC2017-32",
@@ -377,7 +377,7 @@ conf.Q2wx3v7st = {
 }
 
 conf.Q2wx3v7sf = {
-	name = "Qt5.12.12-Windows-x86-VS2017-&MSVCVER&-staticFull",
+	name = "Qt5.12.12-Windows-x86-VS2017-&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "5.12.12",
 	host = "Win10",
 	toolchain = "MSVC2017-32",
@@ -422,7 +422,7 @@ conf.Q2wx3v7sf = {
 }
 
 conf.Q2wx6v7 = {
-	name = "Qt5.12.12-Windows-x86_64-VS2017-&MSVCVER&",
+	name = "Qt5.12.12-Windows-x86_64-VS2017-&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "Win10",
 	toolchain = "MSVC2017-64",
@@ -462,7 +462,7 @@ conf.Q2wx6v7 = {
 }
 
 conf.Q2wx6v7sf = {
-	name = "Qt5.12.12-Windows-x86_64-VS2017-&MSVCVER&-staticFull",
+	name = "Qt5.12.12-Windows-x86_64-VS2017-&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "5.12.12",
 	host = "Win10",
 	toolchain = "MSVC2017-64",
@@ -507,7 +507,7 @@ conf.Q2wx6v7sf = {
 }
 
 conf.Q2wx3v9 = {
-	name = "Qt5.12.12-Windows-x86-VS2019-&MSVCVER&",
+	name = "Qt5.12.12-Windows-x86-VS2019-&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "Win10",
 	toolchain = "MSVC2019-32",
@@ -548,7 +548,7 @@ conf.Q2wx3v9 = {
 }
 
 conf.Q2wx6v9 = {
-	name = "Qt5.12.12-Windows-x86_64-VS2019-&MSVCVER&",
+	name = "Qt5.12.12-Windows-x86_64-VS2019-&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -589,7 +589,7 @@ conf.Q2wx6v9 = {
 }
 
 conf.Q2wx3m7 = {
-	name = "Qt5.12.12-Windows-x86-MinGW7.3.0",
+	name = "Qt5.12.12-Windows-x86-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "Win8",
 	toolchain = "MinGW730-32",
@@ -628,7 +628,7 @@ conf.Q2wx3m7 = {
 }
 
 conf.Q2wx3m7sf = {
-	name = "Qt5.12.12-Windows-x86-MinGW7.3.0-staticFull",
+	name = "Qt5.12.12-Windows-x86-MinGW&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "5.12.12",
 	host = "Win8",
 	toolchain = "MinGW730-32",
@@ -673,7 +673,7 @@ conf.Q2wx3m7sf = {
 }
 
 conf.Q2wx6m7 = {
-	name = "Qt5.12.12-Windows-x86_64-MinGW7.3.0",
+	name = "Qt5.12.12-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "Win8",
 	toolchain = "MinGW730-64",
@@ -712,7 +712,7 @@ conf.Q2wx6m7 = {
 }
 
 conf.Q2wx6m7sf = {
-	name = "Qt5.12.12-Windows-x86_64-MinGW7.3.0-staticFull",
+	name = "Qt5.12.12-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "5.12.12",
 	host = "Win8",
 	toolchain = "MinGW730-64",
@@ -757,7 +757,7 @@ conf.Q2wx6m7sf = {
 }
 
 conf.Q2lx6st = {
-	name = "Qt5.12.12-Linux-x86_64-gcc8.5.0-static",
+	name = "Qt5.12.12-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
 	qtVersion = "5.12.12",
 	host = "CentOS8",
 	variant = {"-static"},
@@ -849,7 +849,7 @@ conf.Q2lx6st = {
 }
 
 conf.q5_12mLx6st = {
-	name = "Qt5.12.12-macOSLegacy-x86_64-AppleClang&AppleClangVersion&-static",
+	name = "Qt5.12.12-macOSLegacy-x86_64-AppleClang&HOSTTOOLVERSION&-static",
 	qtVersion = "5.12.12",
 	host = "macOSLegacy",
 	variant = {"-static"},
@@ -945,7 +945,7 @@ conf.q5_12mLx6st = {
 }
 
 conf.Q2wx6m7_aa3nl = {
-	name = "Qt5.12.12-Android-arm-Clang-NDKr21e-XWindows-x86_64-MinGW7.3.0",
+	name = "Qt5.12.12-Android-arm-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "Win10",
 	toolchain = "MinGW730-64",
@@ -999,7 +999,7 @@ conf.Q2wx6m7_aa3nl = {
 }
 
 conf.Q2wx6m7_aa6nl = {
-	name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-XWindows-x86_64-MinGW7.3.0",
+	name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "Win10",
 	toolchain = "MinGW730-64",
@@ -1053,7 +1053,7 @@ conf.Q2wx6m7_aa6nl = {
 }
 
 conf.Q2wx6m7_ax3nl = {
-	name = "Qt5.12.12-Android-x86-Clang-NDKr21e-XWindows-x86_64-MinGW7.3.0",
+	name = "Qt5.12.12-Android-x86-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "Win10",
 	toolchain = "MinGW730-64",
@@ -1107,7 +1107,7 @@ conf.Q2wx6m7_ax3nl = {
 }
 
 conf.Q2lx6_aa3nl = {
-	name = "Qt5.12.12-Android-arm-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0",
+	name = "Qt5.12.12-Android-arm-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "CentOS8",
 	target = "Android-21",
@@ -1160,7 +1160,7 @@ conf.Q2lx6_aa3nl = {
 }
 
 conf.Q2lx6_aa6nl = {
-	name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0",
+	name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "CentOS8",
 	target = "Android-21",
@@ -1213,7 +1213,7 @@ conf.Q2lx6_aa6nl = {
 }
 
 conf.Q2lx6_ax3nl = {
-	name = "Qt5.12.12-Android-x86-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0",
+	name = "Qt5.12.12-Android-x86-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "CentOS8",
 	target = "Android-21",
@@ -1266,7 +1266,7 @@ conf.Q2lx6_ax3nl = {
 }
 
 conf.Q2mx6_aa3nl = {
-	name = "Qt5.12.12-Android-arm-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt5.12.12-Android-arm-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "macOSLegacy",
 	target = "Android-21",
@@ -1319,7 +1319,7 @@ conf.Q2mx6_aa3nl = {
 }
 
 conf.Q2mx6_aa6nl = {
-	name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "macOSLegacy",
 	target = "Android-21",
@@ -1372,7 +1372,7 @@ conf.Q2mx6_aa6nl = {
 }
 
 conf.Q2mx6_ax3nl = {
-	name = "Qt5.12.12-Android-x86-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt5.12.12-Android-x86-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.12.12",
 	host = "macOSLegacy",
 	target = "Android-21",
@@ -1424,74 +1424,6 @@ conf.Q2mx6_ax3nl = {
 	OPENSSL_LIBS="&OPENSSLDIR&/lib/libssl.a &OPENSSLDIR&/lib/libcrypto.a",
 }
 
-conf.Q2lx6_W = {
-	name = "Qt5.12.12-WebAssembly-emscripten1.38.16-xLinux-x86_64-gcc8.5.0",
-	qtVersion = "5.12.12",
-	host = "CentOS8",
-	target = "WebAssembly",
-	toolchainT = "emscripten-1.38.16",
-	configureParameter = [[
-		-prefix
-		/
-		-opensource
-		-release
-		-confirm-license
-		-platform
-		linux-g++
-		-xplatform
-		wasm-emscripten
-		-nomake
-		examples
-		-nomake
-		tests
-		-no-compile-examples
-		-qt-doubleconversion
-		-qt-zlib
-		-qt-pcre
-		-no-icu
-		-opengl
-		es2
-		-no-ssl
-		-sql-sqlite
-		-make-tool
-		"make -j$PARALLELNUM"
-	]],
-}
-
-conf.Q2mx6_W = {
-	name = "Qt5.12.12-WebAssembly-emscripten1.38.16-xmacOS-x86_64-AppleClang&AppleClangVersion&",
-	qtVersion = "5.12.12",
-	host = "macOSLegacy",
-	target = "WebAssembly",
-	toolchainT = "emscripten-1.38.16",
-	configureParameter = [[
-		-prefix
-		/
-		-opensource
-		-release
-		-confirm-license
-		-platform
-		macx-clang
-		-xplatform
-		wasm-emscripten
-		-nomake
-		examples
-		-nomake
-		tests
-		-no-compile-examples
-		-qt-doubleconversion
-		-qt-zlib
-		-qt-pcre
-		-no-icu
-		-opengl
-		es2
-		-no-ssl
-		-sql-sqlite
-		-make-tool
-		"make -j$PARALLELNUM"
-	]],
-}
-
 --------------------------------------------------------------------
 
 -- Qt 5.15.5
@@ -1567,7 +1499,7 @@ conf.Q5wx6v5 = {
 }
 
 conf.Q5wx3v7 = {
-	name = "Qt5.15.5-Windows-x86-VS2017-&MSVCVER&",
+	name = "Qt5.15.5-Windows-x86-VS2017-&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5-5",
 	host = "Win10",
 	toolchain = "MSVC2017-32",
@@ -1604,7 +1536,7 @@ conf.Q5wx3v7 = {
 }
 
 conf.Q5wx6v7 = {
-	name = "Qt5.15.5-Windows-x86_64-VS2017-&MSVCVER&",
+	name = "Qt5.15.5-Windows-x86_64-VS2017-&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5-5",
 	host = "Win10",
 	toolchain = "MSVC2017-64",
@@ -1641,7 +1573,7 @@ conf.Q5wx6v7 = {
 }
 
 conf.Q5wx3v9 = {
-	name = "Qt5.15.5-Windows-x86-VS2019-&MSVCVER&",
+	name = "Qt5.15.5-Windows-x86-VS2019-&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5-5",
 	host = "Win10",
 	toolchain = "MSVC2019-32",
@@ -1677,7 +1609,7 @@ conf.Q5wx3v9 = {
 }
 
 conf.Q5wx3v9sf = {
-	name = "Qt5.15.5-Windows-x86-VS2019-&MSVCVER&-staticFull",
+	name = "Qt5.15.5-Windows-x86-VS2019-&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "5.15.5-5",
 	host = "Win10",
 	toolchain = "MSVC2019-32",
@@ -1719,7 +1651,7 @@ conf.Q5wx3v9sf = {
 }
 
 conf.Q5wx6v9 = {
-	name = "Qt5.15.5-Windows-x86_64-VS2019-&MSVCVER&",
+	name = "Qt5.15.5-Windows-x86_64-VS2019-&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5-5",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -1755,7 +1687,7 @@ conf.Q5wx6v9 = {
 }
 
 conf.Q5wx6v9sf = {
-	name = "Qt5.15.5-Windows-x86_64-VS2019-&MSVCVER&-staticFull",
+	name = "Qt5.15.5-Windows-x86_64-VS2019-&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "5.15.5-5",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -1797,7 +1729,7 @@ conf.Q5wx6v9sf = {
 }
 
 conf.Q5wx6v2 = {
-	name = "Qt5.15.5-Windows-x86_64-VS2022-&MSVCVER&",
+	name = "Qt5.15.5-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5-5",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
@@ -1834,7 +1766,7 @@ conf.Q5wx6v2 = {
 }
 
 conf.Q5wx3m8 = {
-	name = "Qt5.15.5-Windows-x86-MinGW8.1.0",
+	name = "Qt5.15.5-Windows-x86-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5",
 	host = "Win10",
 	toolchain = "MinGW810-32",
@@ -1869,7 +1801,7 @@ conf.Q5wx3m8 = {
 }
 
 conf.Q5wx3m8sf = {
-	name = "Qt5.15.5-Windows-x86-MinGW8.1.0-staticFull",
+	name = "Qt5.15.5-Windows-x86-MinGW&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "5.15.5",
 	host = "Win10",
 	toolchain = "MinGW810-32",
@@ -1909,7 +1841,7 @@ conf.Q5wx3m8sf = {
 }
 
 conf.Q5wx6m8 = {
-	name = "Qt5.15.5-Windows-x86_64-MinGW8.1.0",
+	name = "Qt5.15.5-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5",
 	host = "Win10",
 	toolchain = "MinGW810-64",
@@ -1944,7 +1876,7 @@ conf.Q5wx6m8 = {
 }
 
 conf.Q5wx6m8sf = {
-	name = "Qt5.15.5-Windows-x86_64-MinGW8.1.0-staticFull",
+	name = "Qt5.15.5-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "5.15.5",
 	host = "Win10",
 	toolchain = "MinGW810-64",
@@ -1984,7 +1916,7 @@ conf.Q5wx6m8sf = {
 }
 
 conf.Q5mx6 = {
-	name = "Qt5.15.5-macOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt5.15.5-macOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5-5",
 	host = "macOSLegacy",
 	configureParameter = [[
@@ -2019,7 +1951,7 @@ conf.Q5mx6 = {
 }
 
 conf.Q5mx6nf = {
-	name = "Qt5.15.5-macOS-x86_64-AppleClang&AppleClangVersion&-noFramework",
+	name = "Qt5.15.5-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework",
 	qtVersion = "5.15.5-5",
 	host = "macOSLegacy",
 	variant = {"-noFramework"},
@@ -2056,7 +1988,7 @@ conf.Q5mx6nf = {
 }
 
 conf.Q5wx6m8_aalnl = {
-	name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW8.1.0",
+	name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5",
 	host = "Win10",
 	toolchain = "MinGW810-64",
@@ -2109,7 +2041,7 @@ conf.Q5wx6m8_aalnl = {
 }
 
 conf.Q5lx6_aalnl = {
-	name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0",
+	name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5",
 	host = "CentOS8",
 	target = "Android-21",
@@ -2161,7 +2093,7 @@ conf.Q5lx6_aalnl = {
 }
 
 conf.Q5mx6_aalnl = {
-	name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5",
 	host = "macOSLegacy",
 	target = "Android-21",
@@ -2213,7 +2145,7 @@ conf.Q5mx6_aalnl = {
 }
 
 conf.Q5wx6m8_W = {
-	name = "Qt5.15.5-WebAssembly-emscripten1.39.8-xWindows-x86_64-MinGW8.1.0",
+	name = "Qt5.15.5-WebAssembly-emscripten&TARGETEMCCVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5",
 	host = "Win10",
 	toolchain = "MinGW810-64",
@@ -2249,7 +2181,7 @@ conf.Q5wx6m8_W = {
 }
 
 conf.Q5lx6_W = {
-	name = "Qt5.15.5-WebAssembly-emscripten1.39.8-xLinux-x86_64-gcc8.5.0",
+	name = "Qt5.15.5-WebAssembly-emscripten&TARGETEMCCVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5",
 	host = "CentOS8",
 	target = "WebAssembly",
@@ -2284,7 +2216,7 @@ conf.Q5lx6_W = {
 }
 
 conf.Q5mx6_W = {
-	name = "Qt5.15.5-WebAssembly-emscripten1.39.8-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt5.15.5-WebAssembly-emscripten&TARGETEMCCVERSION&-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.15.5",
 	host = "macOSLegacy",
 	target = "WebAssembly",
@@ -2321,7 +2253,7 @@ conf.Q5mx6_W = {
 --------------------------------------------------------------------
 
 conf.q5_kdewx3m8 = {
-	name = "Qt5.15-KDE-Windows-x86-MinGW8.1.0",
+	name = "Qt5.15-KDE-Windows-x86-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.15.k",
 	host = "Win10",
 	toolchain = "MinGW810-32",
@@ -2356,7 +2288,7 @@ conf.q5_kdewx3m8 = {
 }
 
 conf.q5_kdewx6m8 = {
-	name = "Qt5.15-KDE-Windows-x86_64-MinGW8.1.0",
+	name = "Qt5.15-KDE-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.15.k",
 	host = "Win10",
 	toolchain = "MinGW810-64",
@@ -2391,7 +2323,7 @@ conf.q5_kdewx6m8 = {
 }
 
 conf.q5_kdewx3v9 = {
-	name = "Qt5.15-KDE-Windows-x86-VS2019-&MSVCVER&",
+	name = "Qt5.15-KDE-Windows-x86-VS2019-&HOSTTOOLVERSION&",
 	qtVersion = "5.15.k",
 	host = "Win10",
 	toolchain = "MSVC2019-32",
@@ -2427,7 +2359,7 @@ conf.q5_kdewx3v9 = {
 }
 
 conf.q5_kdewx6v9 = {
-	name = "Qt5.15-KDE-Windows-x86_64-VS2019-&MSVCVER&",
+	name = "Qt5.15-KDE-Windows-x86_64-VS2019-&HOSTTOOLVERSION&",
 	qtVersion = "5.15.k",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -2463,7 +2395,7 @@ conf.q5_kdewx6v9 = {
 }
 
 conf.q5_kdewx6v2 = {
-	name = "Qt5.15-KDE-Windows-x86_64-VS2022-&MSVCVER&",
+	name = "Qt5.15-KDE-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
 	qtVersion = "5.15.k",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
@@ -2499,7 +2431,7 @@ conf.q5_kdewx6v2 = {
 }
 
 conf.q5_kdemx6 = {
-	name = "Qt5.15-KDE-macOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt5.15-KDE-macOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.15.k",
 	host = "macOS1015",
 	configureParameter = [[
@@ -2534,7 +2466,7 @@ conf.q5_kdemx6 = {
 }
 
 conf.q5_kdemx6nf = {
-	name = "Qt5.15-KDE-macOS-x86_64-AppleClang&AppleClangVersion&-noFramework",
+	name = "Qt5.15-KDE-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework",
 	qtVersion = "5.15.k",
 	host = "macOS1015",
 	variant = {"-noFramework"},
@@ -2571,7 +2503,7 @@ conf.q5_kdemx6nf = {
 }
 
 conf.q5_kdewx6m8_aalnl = {
-	name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW8.1.0",
+	name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.15.k",
 	host = "Win10",
 	toolchain = "MinGW810-64",
@@ -2624,7 +2556,7 @@ conf.q5_kdewx6m8_aalnl = {
 }
 
 conf.q5_kdelx6_aalnl = {
-	name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0",
+	name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "5.15.k",
 	host = "CentOS8",
 	target = "Android-21",
@@ -2676,7 +2608,7 @@ conf.q5_kdelx6_aalnl = {
 }
 
 conf.q5_kdemx6_aalnl = {
-	name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.15.k",
 	host = "macOS1015",
 	target = "Android-21",
@@ -2730,7 +2662,7 @@ conf.q5_kdemx6_aalnl = {
 --------------------------------------------------------------------
 
 conf.q6_2wx6v9 = {
-	name = "Qt6.2.4-Windows-x86_64-VS2019-&MSVCVER&",
+	name = "Qt6.2.4-Windows-x86_64-VS2019-&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -2766,7 +2698,7 @@ conf.q6_2wx6v9 = {
 }
 
 conf.q6_2wx6v9st = {
-	name = "Qt6.2.4-Windows-x86_64-VS2019-&MSVCVER&-static",
+	name = "Qt6.2.4-Windows-x86_64-VS2019-&HOSTTOOLVERSION&-static",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -2823,7 +2755,7 @@ conf.q6_2wx6v9st = {
 }
 
 conf.q6_2wx6v9sf = {
-	name = "Qt6.2.4-Windows-x86_64-VS2019-&MSVCVER&-staticFull",
+	name = "Qt6.2.4-Windows-x86_64-VS2019-&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -2859,7 +2791,7 @@ conf.q6_2wx6v9sf = {
 }
 
 conf.q6_2wx6v9_wa6v9 = {
-	name = "Qt6.2.4-Windows-arm64-VS2019-&MSVCVER&-XWindows-x86_64-VS2019-&MSVCVER&",
+	name = "Qt6.2.4-Windows-arm64-VS2019-&HOSTTOOLVERSION&-XWindows-x86_64-VS2019-&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	target = "Win10Arm",
@@ -2895,7 +2827,7 @@ conf.q6_2wx6v9_wa6v9 = {
 }
 
 conf.q6_2wx6v2 = {
-	name = "Qt6.2.4-Windows-x86_64-VS2022-&MSVCVER&",
+	name = "Qt6.2.4-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
@@ -2930,7 +2862,7 @@ conf.q6_2wx6v2 = {
 }
 
 conf.q6_2wx6m1 = {
-	name = "Qt6.2.4-Windows-x86_64-MinGW11.2.0",
+	name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MinGW1120-64",
@@ -2964,7 +2896,7 @@ conf.q6_2wx6m1 = {
 }
 
 conf.q6_2wx6m1st = {
-	name = "Qt6.2.4-Windows-x86_64-MinGW11.2.0-static",
+	name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MinGW1120-64",
@@ -3022,7 +2954,7 @@ conf.q6_2wx6m1st = {
 }
 
 conf.q6_2wx6m1sf = {
-	name = "Qt6.2.4-Windows-x86_64-MinGW11.2.0-staticFull",
+	name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MinGW1120-64",
@@ -3059,7 +2991,7 @@ conf.q6_2wx6m1sf = {
 }
 
 conf.q6_2wx6m2 = {
-	name = "Qt6.2.4-Windows-x86_64-MinGW12.1.0",
+	name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MinGW1210-64",
@@ -3093,7 +3025,7 @@ conf.q6_2wx6m2 = {
 }
 
 conf.q6_2wx6m2sf = {
-	name = "Qt6.2.4-Windows-x86_64-MinGW12.1.0-staticFull",
+	name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MinGW1210-64",
@@ -3132,7 +3064,7 @@ conf.q6_2wx6m2sf = {
 -- Note: Current instruction by "q6_*wx6mu" has nowhere to indicate that this is an LLVM-based toolchain.
 -- Future version of this build configuration should be called "q6_*wx6Lu" where "L" means LLVM-based toolchain.
 conf.q6_2wx6mu = {
-	name = "Qt6.2.4-Windows-x86_64-llvm-mingw-14.0.0-ucrt",
+	name = "Qt6.2.4-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MinGWLLVM-ucrt14-64",
@@ -3173,7 +3105,7 @@ conf.q6_2wx6mu = {
 -- Note: Current instruction by "q6_*wx6mv" has nowhere to indicate that this is an LLVM-based toolchain.
 -- Note: Future version of this build configuration should be called "q6_*wx6Lv" where "L" means LLVM-based toolchain.
 conf.q6_2wx6mv = {
-	name = "Qt6.2.4-Windows-x86_64-llvm-mingw-14.0.0-msvcrt",
+	name = "Qt6.2.4-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MinGWLLVM-msvcrt14-64",
@@ -3212,7 +3144,7 @@ conf.q6_2wx6mv = {
 }
 
 conf.q6_2lx6st = {
-	name = "Qt6.2.4-Linux-x86_64-gcc8.5.0-static",
+	name = "Qt6.2.4-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
 	qtVersion = "6.2.4",
 	host = "CentOS8",
 	variant = {"-static"},
@@ -3264,7 +3196,7 @@ conf.q6_2lx6st = {
 }
 
 conf.q6_2mx6 = {
-	name = "Qt6.2.4-macOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt6.2.4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "macOS1015",
 	opensslConf = "o3mx6",
@@ -3301,7 +3233,7 @@ conf.q6_2mx6 = {
 }
 
 conf.q6_2mx6nf = {
-	name = "Qt6.2.4-macOS-x86_64-AppleClang&AppleClangVersion&-noFramework",
+	name = "Qt6.2.4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework",
 	qtVersion = "6.2.4",
 	host = "macOS1015",
 	variant = {"-noFramework"},
@@ -3339,7 +3271,7 @@ conf.q6_2mx6nf = {
 }
 
 conf.q6_2mx6st = {
-	name = "Qt6.2.4-macOS-x86_64-AppleClang&AppleClangVersion&-static",
+	name = "Qt6.2.4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-static",
 	qtVersion = "6.2.4",
 	host = "macOS1015",
 	variant = {"-static"},
@@ -3396,7 +3328,7 @@ conf.q6_2mx6st = {
 }
 
 conf.q6_2mx6sf = {
-	name = "Qt6.2.4-macOS-x86_64-AppleClang&AppleClangVersion&-staticFull",
+	name = "Qt6.2.4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "6.2.4",
 	host = "macOS1015",
 	variant = {"-staticFull"},
@@ -3432,7 +3364,7 @@ conf.q6_2mx6sf = {
 }
 
 conf.q6_2ma6 = {
-	name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&AppleClangVersion&",
+	name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "macOSM1",
 	opensslConf = "o3ma6",
@@ -3469,7 +3401,7 @@ conf.q6_2ma6 = {
 }
 
 conf.q6_2ma6nf = {
-	name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&AppleClangVersion&-noFramework",
+	name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-noFramework",
 	qtVersion = "6.2.4",
 	host = "macOSM1",
 	variant = {"-noFramework"},
@@ -3507,7 +3439,7 @@ conf.q6_2ma6nf = {
 }
 
 conf.q6_2ma6sf = {
-	name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&AppleClangVersion&-staticFull",
+	name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-staticFull",
 	qtVersion = "6.2.4",
 	host = "macOSM1",
 	variant = {"-staticFull"},
@@ -3543,7 +3475,7 @@ conf.q6_2ma6sf = {
 }
 
 conf.q6_2wx6m1_aa3n3 = {
-	name = "Qt6.2.4-Android-arm-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0",
+	name = "Qt6.2.4-Android-arm-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	target = "Android-24",
@@ -3582,7 +3514,7 @@ conf.q6_2wx6m1_aa3n3 = {
 }
 
 conf.q6_2wx6m1_aa6n3 = {
-	name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0",
+	name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	target = "Android-24",
@@ -3621,7 +3553,7 @@ conf.q6_2wx6m1_aa6n3 = {
 }
 
 conf.q6_2wx6m1_ax3n3 = {
-	name = "Qt6.2.4-Android-x86-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0",
+	name = "Qt6.2.4-Android-x86-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	target = "Android-24",
@@ -3660,7 +3592,7 @@ conf.q6_2wx6m1_ax3n3 = {
 }
 
 conf.q6_2wx6m1_ax6n3 = {
-	name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0",
+	name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	target = "Android-24",
@@ -3699,7 +3631,7 @@ conf.q6_2wx6m1_ax6n3 = {
 }
 
 conf.q6_2lx6_aa3n3 = {
-	name = "Qt6.2.4-Android-arm-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0",
+	name = "Qt6.2.4-Android-arm-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "CentOS8",
 	target = "Android-24",
@@ -3736,7 +3668,7 @@ conf.q6_2lx6_aa3n3 = {
 }
 
 conf.q6_2lx6_aa6n3 = {
-	name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0",
+	name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "CentOS8",
 	target = "Android-24",
@@ -3773,7 +3705,7 @@ conf.q6_2lx6_aa6n3 = {
 }
 
 conf.q6_2lx6_ax3n3 = {
-	name = "Qt6.2.4-Android-x86-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0",
+	name = "Qt6.2.4-Android-x86-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "CentOS8",
 	target = "Android-24",
@@ -3810,7 +3742,7 @@ conf.q6_2lx6_ax3n3 = {
 }
 
 conf.q6_2lx6_ax6n3 = {
-	name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0",
+	name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "CentOS8",
 	target = "Android-24",
@@ -3847,7 +3779,7 @@ conf.q6_2lx6_ax6n3 = {
 }
 
 conf.q6_2mx6_aa3n3 = {
-	name = "Qt6.2.4-Android-arm-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt6.2.4-Android-arm-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "macOS1015",
 	target = "Android-24",
@@ -3884,7 +3816,7 @@ conf.q6_2mx6_aa3n3 = {
 }
 
 conf.q6_2mx6_aa6n3 = {
-	name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "macOS1015",
 	target = "Android-24",
@@ -3921,7 +3853,7 @@ conf.q6_2mx6_aa6n3 = {
 }
 
 conf.q6_2mx6_ax3n3 = {
-	name = "Qt6.2.4-Android-x86-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt6.2.4-Android-x86-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "macOS1015",
 	target = "Android-24",
@@ -3958,7 +3890,7 @@ conf.q6_2mx6_ax3n3 = {
 }
 
 conf.q6_2mx6_ax6n3 = {
-	name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "macOS1015",
 	target = "Android-24",
@@ -3996,7 +3928,7 @@ conf.q6_2mx6_ax6n3 = {
 
 -- WebAssembly uses emcmake which don't need a toolchain file
 conf.q6_2wx6m1_W = {
-	name = "Qt6.2.4-WebAssembly-emscripten2.0.14-xWindows-x86_64-MinGW11.2.0",
+	name = "Qt6.2.4-WebAssembly-emscripten&TARGETEMCCVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "Win10",
 	toolchain = "MinGW1120-64",
@@ -4028,7 +3960,7 @@ conf.q6_2wx6m1_W = {
 }
 
 conf.q6_2lx6_W = {
-	name = "Qt6.2.4-WebAssembly-emscripten2.0.14-xLinux-x86_64-gcc8.5.0",
+	name = "Qt6.2.4-WebAssembly-emscripten&TARGETEMCCVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "CentOS8",
 	target = "WebAssembly",
@@ -4057,7 +3989,7 @@ conf.q6_2lx6_W = {
 }
 
 conf.q6_2mx6_W = {
-	name = "Qt6.2.4-WebAssembly-emscripten2.0.14-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt6.2.4-WebAssembly-emscripten&TARGETEMCCVERSION&-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.2.4",
 	host = "macOS1015",
 	target = "WebAssembly",
@@ -4088,7 +4020,7 @@ conf.q6_2mx6_W = {
 --------------------------------------------------------------------
 
 conf.q6_3wx6v9 = {
-	name = "Qt6.3.1-Windows-x86_64-VS2019-&MSVCVER&",
+	name = "Qt6.3.1-Windows-x86_64-VS2019-&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
@@ -4124,7 +4056,7 @@ conf.q6_3wx6v9 = {
 }
 
 conf.q6_3wx6v2 = {
-	name = "Qt6.3.1-Windows-x86_64-VS2022-&MSVCVER&",
+	name = "Qt6.3.1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
@@ -4159,7 +4091,7 @@ conf.q6_3wx6v2 = {
 }
 
 conf.q6_3wx6v2st = {
-	name = "Qt6.3.1-Windows-x86_64-VS2022-&MSVCVER&-static",
+	name = "Qt6.3.1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
@@ -4216,7 +4148,7 @@ conf.q6_3wx6v2st = {
 }
 
 conf.q6_3wx6v2_wa6v2 = {
-	name = "Qt6.3.1-Windows-arm64-VS2022-&MSVCVER&-XWindows-x86_64-VS2022-&MSVCVER&",
+	name = "Qt6.3.1-Windows-arm64-VS2022-&HOSTTOOLVERSION&-XWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	target = "Win10Arm",
@@ -4252,7 +4184,7 @@ conf.q6_3wx6v2_wa6v2 = {
 }
 
 conf.q6_3wx6m1 = {
-	name = "Qt6.3.1-Windows-x86_64-MinGW11.2.0",
+	name = "Qt6.3.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	toolchain = "MinGW1120-64",
@@ -4286,7 +4218,7 @@ conf.q6_3wx6m1 = {
 }
 
 conf.q6_3wx6m1st = {
-	name = "Qt6.3.1-Windows-x86_64-MinGW11.2.0-static",
+	name = "Qt6.3.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	toolchain = "MinGW1120-64",
@@ -4344,7 +4276,7 @@ conf.q6_3wx6m1st = {
 }
 
 conf.q6_3wx6m2 = {
-	name = "Qt6.3.1-Windows-x86_64-MinGW12.1.0",
+	name = "Qt6.3.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	toolchain = "MinGW1210-64",
@@ -4380,7 +4312,7 @@ conf.q6_3wx6m2 = {
 -- Note: Current instruction by "q6_*wx6mu" has nowhere to indicate that this is an LLVM-based toolchain.
 -- Note: Future version of this build configuration should be called "q6_*wx6Lu" where "L" means LLVM-based toolchain.
 conf.q6_3wx6mu = {
-	name = "Qt6.3.1-Windows-x86_64-llvm-mingw-14.0.0-ucrt",
+	name = "Qt6.3.1-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	toolchain = "MinGWLLVM-ucrt14-64",
@@ -4421,7 +4353,7 @@ conf.q6_3wx6mu = {
 -- Note: Current instruction by "q6_*wx6mv" has nowhere to indicate that this is an LLVM-based toolchain.
 -- Note: Future version of this build configuration should be called "q6_*wx6Lv" where "L" means LLVM-based toolchain.
 conf.q6_3wx6mv = {
-	name = "Qt6.3.1-Windows-x86_64-llvm-mingw-14.0.0-msvcrt",
+	name = "Qt6.3.1-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	toolchain = "MinGWLLVM-msvcrt14-64",
@@ -4460,7 +4392,7 @@ conf.q6_3wx6mv = {
 }
 
 conf.q6_3lx6st = {
-	name = "Qt6.3.1-Linux-x86_64-gcc8.5.0-static",
+	name = "Qt6.3.1-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
 	qtVersion = "6.3.1",
 	host = "CentOS8",
 	variant = {"-static"},
@@ -4512,7 +4444,7 @@ conf.q6_3lx6st = {
 }
 
 conf.q6_3mx6 = {
-	name = "Qt6.3.1-macOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt6.3.1-macOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "macOS1015",
 	opensslConf = "o3mx6",
@@ -4550,7 +4482,7 @@ conf.q6_3mx6 = {
 }
 
 conf.q6_3mx6nf = {
-	name = "Qt6.3.1-macOS-x86_64-AppleClang&AppleClangVersion&-noFramework",
+	name = "Qt6.3.1-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework",
 	qtVersion = "6.3.1",
 	host = "macOS1015",
 	variant = {"-noFramework"},
@@ -4589,7 +4521,7 @@ conf.q6_3mx6nf = {
 }
 
 conf.q6_3mx6st = {
-	name = "Qt6.3.1-macOS-x86_64-AppleClang&AppleClangVersion&-static",
+	name = "Qt6.3.1-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-static",
 	qtVersion = "6.3.1",
 	host = "macOS1015",
 	variant = {"-static"},
@@ -4646,7 +4578,7 @@ conf.q6_3mx6st = {
 }
 
 conf.q6_3ma6 = {
-	name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&AppleClangVersion&",
+	name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "macOSM1",
 	opensslConf = "o3ma6",
@@ -4684,7 +4616,7 @@ conf.q6_3ma6 = {
 }
 
 conf.q6_3ma6nf = {
-	name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&AppleClangVersion&-noFramework",
+	name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-noFramework",
 	qtVersion = "6.3.1",
 	host = "macOSM1",
 	variant = {"-noFramework"},
@@ -4723,7 +4655,7 @@ conf.q6_3ma6nf = {
 }
 
 conf.q6_3ma6st = {
-	name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&AppleClangVersion&-static",
+	name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-static",
 	qtVersion = "6.3.1",
 	host = "macOSM1",
 	variant = {"-static"},
@@ -4780,7 +4712,7 @@ conf.q6_3ma6st = {
 }
 
 conf.q6_3wx6m1_aa6n3 = {
-	name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0",
+	name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	target = "Android-24",
@@ -4819,7 +4751,7 @@ conf.q6_3wx6m1_aa6n3 = {
 }
 
 conf.q6_3wx6m1_ax6n3 = {
-	name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0",
+	name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	target = "Android-24",
@@ -4858,7 +4790,7 @@ conf.q6_3wx6m1_ax6n3 = {
 }
 
 conf.q6_3lx6_aa6n3 = {
-	name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0",
+	name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "CentOS8",
 	target = "Android-24",
@@ -4895,7 +4827,7 @@ conf.q6_3lx6_aa6n3 = {
 }
 
 conf.q6_3lx6_ax6n3 = {
-	name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0",
+	name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "CentOS8",
 	target = "Android-24",
@@ -4932,7 +4864,7 @@ conf.q6_3lx6_ax6n3 = {
 }
 
 conf.q6_3mx6_aa6n3 = {
-	name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "macOS1015",
 	target = "Android-24",
@@ -4969,7 +4901,7 @@ conf.q6_3mx6_aa6n3 = {
 }
 
 conf.q6_3mx6_ax6n3 = {
-	name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "macOS1015",
 	target = "Android-24",
@@ -5006,7 +4938,7 @@ conf.q6_3mx6_ax6n3 = {
 }
 
 conf.q6_3ma6_aa6n3 = {
-	name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xmacOS-arm64_v8a-AppleClang&AppleClangVersion&",
+	name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "macOSM1",
 	target = "Android-24",
@@ -5043,7 +4975,7 @@ conf.q6_3ma6_aa6n3 = {
 }
 
 conf.q6_3ma6_ax6n3 = {
-	name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xmacOS-arm64_v8a-AppleClang&AppleClangVersion&",
+	name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "macOSM1",
 	target = "Android-24",
@@ -5081,7 +5013,7 @@ conf.q6_3ma6_ax6n3 = {
 
 -- WebAssembly uses emcmake which don't need a toolchain file
 conf.q6_3wx6m1_W = {
-	name = "Qt6.3.1-WebAssembly-emscripten3.0.0-xWindows-x86_64-MinGW11.2.0",
+	name = "Qt6.3.1-WebAssembly-emscripten&TARGETEMCCVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "Win10",
 	toolchain = "MinGW1120-64",
@@ -5113,7 +5045,7 @@ conf.q6_3wx6m1_W = {
 }
 
 conf.q6_3lx6_W = {
-	name = "Qt6.3.1-WebAssembly-emscripten3.0.0-xLinux-x86_64-gcc8.5.0",
+	name = "Qt6.3.1-WebAssembly-emscripten&TARGETEMCCVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "CentOS8",
 	target = "WebAssembly",
@@ -5142,7 +5074,7 @@ conf.q6_3lx6_W = {
 }
 
 conf.q6_3mx6_W = {
-	name = "Qt6.3.1-WebAssembly-emscripten3.0.0-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	name = "Qt6.3.1-WebAssembly-emscripten&TARGETEMCCVERSION&-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "macOS1015",
 	target = "WebAssembly",
@@ -5171,7 +5103,7 @@ conf.q6_3mx6_W = {
 }
 
 conf.q6_3ma6_W = {
-	name = "Qt6.3.1-WebAssembly-emscripten3.0.0-xmacOS-arm64_v8a-AppleClang&AppleClangVersion&",
+	name = "Qt6.3.1-WebAssembly-emscripten&TARGETEMCCVERSION&-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "6.3.1",
 	host = "macOS1015",
 	target = "WebAssembly",
@@ -5218,19 +5150,6 @@ local QQtPatcherVersion = {
 
 setmetatable(QQtPatcherVersion, versionMo)
 
-local MsvcVer = {
-	["MSVC2015"] = "14",
-	["MSVC2017"] = "15.9.49",
-	["MSVC2019"] = "16.11.16",
-	["MSVC2022"] = "17.2.4",
-}
-
-local AppleClangVersion = {
-	["macOS1015"] = "13.1.6",
-	["macOSM1"] = "13.1.6",
-	["macOSLegacy"] = "12.0.5",
-}
-
 local Qt6StaticConf = {
 	Win10 = {
 		["6.2.4"] = "q6_2wx6m1st",
@@ -5285,14 +5204,6 @@ for name, value in pairs(conf) do
 	if not value.toolchain then
 		value.toolchain = "PATH"
 	end
-
-	-- hack MSVCVER into name
-	if string.sub(value.toolchain, 1, 4) == "MSVC" then
-		value.name = string.gsub(value.name, "%&MSVCVER%&", MsvcVer[string.sub(value.toolchain, 1, 8)])
-	end
-	if string.find(value.name, "AppleClang") then
-		value.name = string.gsub(value.name, "%&AppleClangVersion%&", AppleClangVersion[value.host])
-	end
 end
 
 local valueMo = {