Commit: b3e76456550d7f7dd63e208b692bd55d77fd7fb8 - Fs-scripts (git)

Commit MetaInfo

• Revision: b3e76456550d7f7dd63e208b692bd55d77fd7fb8 (tree)
• Time: 2022-03-05 19:28:59
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

Qt 5.15.3 opensource release

For Qt 5.15.x with latest webengine, we use same version scheme as before, which is (Qt version)-(Qt WebEngine patch version - Qt patch version)
This time it becomes 5.15.3-5.

Change Summary

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

Incremental Difference

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -5,7 +5,7 @@ local conf = {}
 abbrs:
 	Qt Versions:
 		Q2: Qt 5.12.12/Previous Qt 5 LTS
-		Q5: Qt 5.15.2/Latest Qt 5 LTS w/ latest QtWebEngine and latest QtScript
+		Q5: Qt 5.15.3/Latest Qt 5 LTS w/ latest QtWebEngine and latest QtScript
 		q6_2: Qt 6.2.3/Latest Qt 6 LTS w/ latest QtWebEngine and latest QtScript
 	If prefixed with a lower-case "m", it is a modified Qt version
 
@@ -1564,11 +1564,11 @@ conf.Q2mx6_W = {
 
 --------------------------------------------------------------------
 
--- Qt 5.15.2
+-- Qt 5.15.3
 
 conf.Q5wx3v5 = {
-	name = "Qt5.15.2-Windows-x86-VS2015",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-Windows-x86-VS2015",
+	qtVersion = "5.15.3",
 	host = "Win8",
 	toolchain = "MSVC2015-32",
 	configureParameter = [[
@@ -1602,8 +1602,8 @@ conf.Q5wx3v5 = {
 }
 
 conf.Q5wx6v5 = {
-	name = "Qt5.15.2-Windows-x86_64-VS2015",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-Windows-x86_64-VS2015",
+	qtVersion = "5.15.3",
 	host = "Win8",
 	toolchain = "MSVC2015-64",
 	configureParameter = [[
@@ -1637,8 +1637,8 @@ conf.Q5wx6v5 = {
 }
 
 conf.Q5wx3v7 = {
-	name = "Qt5.15.2-Windows-x86-VS2017-&MSVCVER&",
-	qtVersion = "5.15.2-6",
+	name = "Qt5.15.3-Windows-x86-VS2017-&MSVCVER&",
+	qtVersion = "5.15.3-5",
 	host = "Win10",
 	toolchain = "MSVC2017-32",
 	configureParameter = [[
@@ -1674,8 +1674,8 @@ conf.Q5wx3v7 = {
 }
 
 conf.Q5wx6v7 = {
-	name = "Qt5.15.2-Windows-x86_64-VS2017-&MSVCVER&",
-	qtVersion = "5.15.2-6",
+	name = "Qt5.15.3-Windows-x86_64-VS2017-&MSVCVER&",
+	qtVersion = "5.15.3-5",
 	host = "Win10",
 	toolchain = "MSVC2017-64",
 	configureParameter = [[
@@ -1711,8 +1711,8 @@ conf.Q5wx6v7 = {
 }
 
 conf.Q5wx3v9 = {
-	name = "Qt5.15.2-Windows-x86-VS2019-&MSVCVER&",
-	qtVersion = "5.15.2-6",
+	name = "Qt5.15.3-Windows-x86-VS2019-&MSVCVER&",
+	qtVersion = "5.15.3-5",
 	host = "Win10",
 	toolchain = "MSVC2019-32",
 	configureParameter = [[
@@ -1747,8 +1747,8 @@ conf.Q5wx3v9 = {
 }
 
 conf.Q5wx3v9sf = {
-	name = "Qt5.15.2-Windows-x86-VS2019-&MSVCVER&-staticFull",
-	qtVersion = "5.15.2-6",
+	name = "Qt5.15.3-Windows-x86-VS2019-&MSVCVER&-staticFull",
+	qtVersion = "5.15.3-5",
 	host = "Win10",
 	toolchain = "MSVC2019-32",
 	variant = {"-staticFull"},
@@ -1789,8 +1789,8 @@ conf.Q5wx3v9sf = {
 }
 
 conf.Q5wx6v9 = {
-	name = "Qt5.15.2-Windows-x86_64-VS2019-&MSVCVER&",
-	qtVersion = "5.15.2-6",
+	name = "Qt5.15.3-Windows-x86_64-VS2019-&MSVCVER&",
+	qtVersion = "5.15.3-5",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
 	configureParameter = [[
@@ -1825,8 +1825,8 @@ conf.Q5wx6v9 = {
 }
 
 conf.Q5wx6v9sf = {
-	name = "Qt5.15.2-Windows-x86_64-VS2019-&MSVCVER&-staticFull",
-	qtVersion = "5.15.2-6",
+	name = "Qt5.15.3-Windows-x86_64-VS2019-&MSVCVER&-staticFull",
+	qtVersion = "5.15.3-5",
 	host = "Win10",
 	toolchain = "MSVC2019-64",
 	variant = {"-staticFull"},
@@ -1867,8 +1867,8 @@ conf.Q5wx6v9sf = {
 }
 
 conf.Q5wx6v2 = {
-	name = "Qt5.15.2-Windows-x86_64-VS2022-&MSVCVER&",
-	qtVersion = "5.15.2-6",
+	name = "Qt5.15.3-Windows-x86_64-VS2022-&MSVCVER&",
+	qtVersion = "5.15.3-5",
 	host = "Win10",
 	toolchain = "MSVC2022-64",
 	configureParameter = [[
@@ -1903,8 +1903,8 @@ conf.Q5wx6v2 = {
 }
 
 conf.Q5wx3m8 = {
-	name = "Qt5.15.2-Windows-x86-MinGW8.1.0",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-Windows-x86-MinGW8.1.0",
+	qtVersion = "5.15.3",
 	host = "Win10",
 	toolchain = "MinGW810-32",
 	configureParameter = [[
@@ -1938,8 +1938,8 @@ conf.Q5wx3m8 = {
 }
 
 conf.Q5wx3m8sf = {
-	name = "Qt5.15.2-Windows-x86-MinGW8.1.0-staticFull",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-Windows-x86-MinGW8.1.0-staticFull",
+	qtVersion = "5.15.3",
 	host = "Win10",
 	toolchain = "MinGW810-32",
 	variant = {"-staticFull"},
@@ -1978,8 +1978,8 @@ conf.Q5wx3m8sf = {
 }
 
 conf.Q5wx6m8 = {
-	name = "Qt5.15.2-Windows-x86_64-MinGW8.1.0",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-Windows-x86_64-MinGW8.1.0",
+	qtVersion = "5.15.3",
 	host = "Win10",
 	toolchain = "MinGW810-64",
 	configureParameter = [[
@@ -2013,8 +2013,8 @@ conf.Q5wx6m8 = {
 }
 
 conf.Q5wx6m8sf = {
-	name = "Qt5.15.2-Windows-x86_64-MinGW8.1.0-staticFull",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-Windows-x86_64-MinGW8.1.0-staticFull",
+	qtVersion = "5.15.3",
 	host = "Win10",
 	toolchain = "MinGW810-64",
 	variant = {"-staticFull"},
@@ -2053,8 +2053,8 @@ conf.Q5wx6m8sf = {
 }
 
 conf.Q5mx6 = {
-	name = "Qt5.15.2-macOS-x86_64-AppleClang&AppleClangVersion&",
-	qtVersion = "5.15.2-6",
+	name = "Qt5.15.3-macOS-x86_64-AppleClang&AppleClangVersion&",
+	qtVersion = "5.15.3-5",
 	host = "macOSLegacy",
 	configureParameter = [[
 		-prefix
@@ -2088,8 +2088,8 @@ conf.Q5mx6 = {
 }
 
 conf.Q5mx6nf = {
-	name = "Qt5.15.2-macOS-x86_64-AppleClang&AppleClangVersion&-noFramework",
-	qtVersion = "5.15.2-6",
+	name = "Qt5.15.3-macOS-x86_64-AppleClang&AppleClangVersion&-noFramework",
+	qtVersion = "5.15.3-5",
 	host = "macOSLegacy",
 	variant = {"-noFramework"},
 	configureParameter = [[
@@ -2125,8 +2125,8 @@ conf.Q5mx6nf = {
 }
 
 conf.Q5wx6m8_aalnl = {
-	name = "Qt5.15.2-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW8.1.0",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW8.1.0",
+	qtVersion = "5.15.3",
 	host = "Win10",
 	toolchain = "MinGW810-64",
 	target = "Android-21",
@@ -2178,8 +2178,8 @@ conf.Q5wx6m8_aalnl = {
 }
 
 conf.Q5lx6_aalnl = {
-	name = "Qt5.15.2-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0",
+	qtVersion = "5.15.3",
 	host = "CentOS8",
 	target = "Android-21",
 	toolchainT = "Android-21-r21e-all",
@@ -2230,8 +2230,8 @@ conf.Q5lx6_aalnl = {
 }
 
 conf.Q5mx6_aalnl = {
-	name = "Qt5.15.2-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	qtVersion = "5.15.3",
 	host = "macOSLegacy",
 	target = "Android-21",
 	toolchainT = "Android-21-r21e-all",
@@ -2282,8 +2282,8 @@ conf.Q5mx6_aalnl = {
 }
 
 conf.Q5wx6m8_W = {
-	name = "Qt5.15.2-WebAssembly-emscripten1.39.8-xWindows-x86_64-MinGW8.1.0",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-WebAssembly-emscripten1.39.8-xWindows-x86_64-MinGW8.1.0",
+	qtVersion = "5.15.3",
 	host = "Win10",
 	toolchain = "MinGW810-64",
 	target = "WebAssembly",
@@ -2318,8 +2318,8 @@ conf.Q5wx6m8_W = {
 }
 
 conf.Q5lx6_W = {
-	name = "Qt5.15.2-WebAssembly-emscripten1.39.8-xLinux-x86_64-gcc8.5.0",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-WebAssembly-emscripten1.39.8-xLinux-x86_64-gcc8.5.0",
+	qtVersion = "5.15.3",
 	host = "CentOS8",
 	target = "WebAssembly",
 	toolchainT = "emscripten-1.39.8",
@@ -2353,8 +2353,8 @@ conf.Q5lx6_W = {
 }
 
 conf.Q5mx6_W = {
-	name = "Qt5.15.2-WebAssembly-emscripten1.39.8-xmacOS-x86_64-AppleClang&AppleClangVersion&",
-	qtVersion = "5.15.2",
+	name = "Qt5.15.3-WebAssembly-emscripten1.39.8-xmacOS-x86_64-AppleClang&AppleClangVersion&",
+	qtVersion = "5.15.3",
 	host = "macOSLegacy",
 	target = "WebAssembly",
 	toolchainT = "emscripten-1.39.8",
@@ -5244,7 +5244,7 @@ for name, value in pairs(conf) do
 		value.sourcePackageBaseName = "qt5-kde"
 	else
 		local qtSourcePackagePrefix = "qt-everywhere-src-"
-		if ((value.qtVersion == "5.15.2-6") or (value.qtVersion == "6.2.3") or (value.qtVersion == "6.3.0-beta2")) and (value.host == "Win10") then
+		if ((value.qtVersion == "5.15.3-5") or (value.qtVersion == "6.2.3") or (value.qtVersion == "6.3.0-beta2")) and (value.host == "Win10") then
 			qtSourcePackagePrefix = "qt-src-"
 		end
 		value.sourcePackageBaseName = qtSourcePackagePrefix .. value.qtVersion