Commit: e777c1c745c0c436d8a3c1577c272611c3653044 - Fs-scripts (git)

Commit MetaInfo

• Révision: e777c1c745c0c436d8a3c1577c272611c3653044 (tree)
• l'heure: 2023-01-27 21:27:20
• Auteur: Fs <Fsu0413@vip....>
• Commiter: Fs

Message de Log

6.5.0-beta2

Change Summary

• modified: Compile/lib/qtCompile/conf.lua

Modification

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -4594,8 +4594,8 @@ conf.q6_4mal_W = {
 --------------------------------------------------------------------
 
 conf.q6_5wx6v2 = {
-	name = "Qt6.5.0-beta1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
 	opensslConf = "o3wx6v2",
@@ -4630,8 +4630,8 @@ conf.q6_5wx6v2 = {
 }
 
 conf.q6_5wx6v2st = {
-	name = "Qt6.5.0-beta1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
 	variant = {"-static"},
@@ -4694,8 +4694,8 @@ conf.q6_5wx6v2st = {
 }
 
 conf.q6_5wx6v2sf = {
-	name = "Qt6.5.0-beta1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-staticFull",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-staticFull",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
 	variant = {"-staticFull"},
@@ -4733,8 +4733,8 @@ conf.q6_5wx6v2sf = {
 }
 
 conf.q6_5wx6v2_wa6v2 = {
-	name = "Qt6.5.0-beta1-Windows-arm64-VS2022-&HOSTTOOLVERSION&-XWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Windows-arm64-VS2022-&HOSTTOOLVERSION&-XWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	target = "Win10Arm",
 	toolchain = "MSVC2022-64", -- only a placeholder here, in fact it uses "toolchainT" instead of "toolchain"
@@ -4769,8 +4769,8 @@ conf.q6_5wx6v2_wa6v2 = {
 }
 
 conf.q6_5wx6g2 = {
-	name = "Qt6.5.0-beta1-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	toolchain = "MinGW1210-64",
 	opensslConf = "o3wx6m2",
@@ -4803,8 +4803,8 @@ conf.q6_5wx6g2 = {
 }
 
 conf.q6_5wx6g2st = {
-	name = "Qt6.5.0-beta1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	toolchain = "MinGW1210-64",
 	variant = {"-static"},
@@ -4868,8 +4868,8 @@ conf.q6_5wx6g2st = {
 }
 
 conf.q6_5wx6g2sf = {
-	name = "Qt6.5.0-beta1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	toolchain = "MinGW1210-64",
 	variant = {"-staticFull"},
@@ -4908,8 +4908,8 @@ conf.q6_5wx6g2sf = {
 }
 
 conf.q6_5wx6u5 = {
-	name = "Qt6.5.0-beta1-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	toolchain = "MinGWLLVM-ucrt15-64",
 	opensslConf = "o3wx6u5",
@@ -4946,8 +4946,8 @@ conf.q6_5wx6u5 = {
 }
 
 conf.q6_5wx6s5 = {
-	name = "Qt6.5.0-beta1-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	toolchain = "MinGWLLVM-msvcrt15-64",
 	opensslConf = "o3wx6s5",
@@ -4984,8 +4984,8 @@ conf.q6_5wx6s5 = {
 }
 
 conf.q6_5lx6st = {
-	name = "Qt6.5.0-beta1-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
+	qtVersion = "6.5.0-beta2",
 	host = "Rocky9",
 	variant = {"-static"},
 	useCMake = "Latest",
@@ -5042,8 +5042,8 @@ conf.q6_5lx6st = {
 }
 
 conf.q6_5mal = {
-	name = "Qt6.5.0-beta1-macOS-Universal-AppleClang&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-macOS-Universal-AppleClang&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "macOSM1",
 	opensslConf = "o3mal",
 	useCMake = "Latest",
@@ -5081,8 +5081,8 @@ conf.q6_5mal = {
 }
 
 conf.q6_5malnf = {
-	name = "Qt6.5.0-beta1-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework",
+	qtVersion = "6.5.0-beta2",
 	host = "macOSM1",
 	variant = {"-noFramework"},
 	opensslConf = "o3mal",
@@ -5121,8 +5121,8 @@ conf.q6_5malnf = {
 }
 
 conf.q6_5malst = {
-	name = "Qt6.5.0-beta1-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static",
+	qtVersion = "6.5.0-beta2",
 	host = "macOSM1",
 	variant = {"-static"},
 	opensslConf = "o3mal",
@@ -5185,8 +5185,8 @@ conf.q6_5malst = {
 }
 
 conf.q6_5malsf = {
-	name = "Qt6.5.0-beta1-macOS-Universal-AppleClang&HOSTTOOLVERSION&-staticFull",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-macOS-Universal-AppleClang&HOSTTOOLVERSION&-staticFull",
+	qtVersion = "6.5.0-beta2",
 	host = "macOSM1",
 	variant = {"-staticFull"},
 	opensslConf = "o3mal",
@@ -5224,8 +5224,8 @@ conf.q6_5malsf = {
 }
 
 conf.q6_5wx6g2_aa6n5 = {
-	name = "Qt6.5.0-beta1-Android-arm64-Clang-NDKr25b-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Android-arm64-Clang-NDKr25b-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	target = "Android-27",
 	toolchain = "MinGW1210-64",
@@ -5263,8 +5263,8 @@ conf.q6_5wx6g2_aa6n5 = {
 }
 
 conf.q6_5wx6g2_ax6n5 = {
-	name = "Qt6.5.0-beta1-Android-x86_64-Clang-NDKr25b-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Android-x86_64-Clang-NDKr25b-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	target = "Android-27",
 	toolchain = "MinGW1210-64",
@@ -5302,8 +5302,8 @@ conf.q6_5wx6g2_ax6n5 = {
 }
 
 conf.q6_5lx6_aa6n5 = {
-	name = "Qt6.5.0-beta1-Android-arm64-Clang-NDKr25b-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Android-arm64-Clang-NDKr25b-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "Rocky9",
 	target = "Android-27",
 	toolchainT = "Android-27-r25b-arm64",
@@ -5339,8 +5339,8 @@ conf.q6_5lx6_aa6n5 = {
 }
 
 conf.q6_5lx6_ax6n5 = {
-	name = "Qt6.5.0-beta1-Android-x86_64-Clang-NDKr25b-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Android-x86_64-Clang-NDKr25b-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "Rocky9",
 	target = "Android-27",
 	toolchainT = "Android-27-r25b-x86_64",
@@ -5376,8 +5376,8 @@ conf.q6_5lx6_ax6n5 = {
 }
 
 conf.q6_5mal_aa6n5 = {
-	name = "Qt6.5.0-beta1-Android-arm64-Clang-NDKr25b-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Android-arm64-Clang-NDKr25b-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "macOSM1",
 	target = "Android-27",
 	toolchainT = "Android-27-r25b-arm64",
@@ -5413,8 +5413,8 @@ conf.q6_5mal_aa6n5 = {
 }
 
 conf.q6_5mal_ax6n5 = {
-	name = "Qt6.5.0-beta1-Android-x86_64-Clang-NDKr25b-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-Android-x86_64-Clang-NDKr25b-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "macOSM1",
 	target = "Android-27",
 	toolchainT = "Android-27-r25b-x86_64",
@@ -5451,8 +5451,8 @@ conf.q6_5mal_ax6n5 = {
 
 -- WebAssembly uses emcmake which don't need a toolchain file
 conf.q6_5wx6g2_W = {
-	name = "Qt6.5.0-beta1-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "Win10",
 	toolchain = "MinGW1210-64",
 	target = "WebAssembly",
@@ -5482,8 +5482,8 @@ conf.q6_5wx6g2_W = {
 }
 
 conf.q6_5lx6_W = {
-	name = "Qt6.5.0-beta1-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "Rocky9",
 	target = "WebAssembly",
 	toolchainT = "emscripten-3.1.25",
@@ -5512,8 +5512,8 @@ conf.q6_5lx6_W = {
 }
 
 conf.q6_5mal_W = {
-	name = "Qt6.5.0-beta1-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
-	qtVersion = "6.5.0-beta1",
+	name = "Qt6.5.0-beta2-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
+	qtVersion = "6.5.0-beta2",
 	host = "macOSM1",
 	target = "WebAssembly",
 	toolchainT = "emscripten-3.1.25",
@@ -5564,26 +5564,26 @@ local Qt6StaticConf = {
 	Win10 = {
 		["6.2.4"] = "q6_2wx6m1st",
 		["6.4.2"] = "q6_4wx6g2st",
-		["6.5.0-beta1"] = "q6_5wx6g2st",
+		["6.5.0-beta2"] = "q6_5wx6g2st",
 	},
 	Win10MSVC2019 = {
 		["6.2.4"] = "q6_2wx6v9st",
 	},
 	Win10MSVC2022 = {
 		["6.4.2"] = "q6_4wx6v2st",
-		["6.5.0-beta1"] = "q6_5wx6v2st",
+		["6.5.0-beta2"] = "q6_5wx6v2st",
 	},
 	CentOS8 = {
 		["6.2.4"] = "q6_2lx6st",
 	},
 	Rocky9 = {
 		["6.4.2"] = "q6_4lx6st",
-		["6.5.0-beta1"] = "q6_5lx6st",
+		["6.5.0-beta2"] = "q6_5lx6st",
 	},
 	macOSM1 = {
 		["6.2.4"] = "q6_2malst",
 		["6.4.2"] = "q6_4malst",
-		["6.5.0-beta1"] = "q6_5malst",
+		["6.5.0-beta2"] = "q6_5malst",
 	},
 }
 
@@ -5630,7 +5630,7 @@ local Win10SrcPackagePrefixWorkaroundVersions = {
 	"6.2.4",
 	"6.2.4-5",
 	"6.4.2",
-	"6.5.0-beta1",
+	"6.5.0-beta2",
 }
 
 for name, value in pairs(conf) do