OSDN > Entwickler >

fsu0413 > Kammer > Fs-scripts > Commit

fsu0413

Fs-scripts
Fork

(Original-Repository, kein Fork Herkunft)

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revision	1c6b846549704b402fe01fb31c101b4f4a7673c3 (tree)
Zeit	2023-03-23 21:47:32
Autor	Fs <Fsu0413@vip....>
Commiter	Fs

Log Message

咕

Ändern Zusammenfassung

modified: Compile/lib/opensslCompile/conf.lua (diff)
modified: Compile/lib/qtCompile/conf.lua (diff)

Diff

--- a/Compile/lib/opensslCompile/conf.lua

+++ b/Compile/lib/opensslCompile/conf.lua

		@@ -4,8 +4,8 @@ local conf = {}
4	4	--[[
5	5	abbrs:
6	6	OpenSSL Versions:
7		- o1: OpenSSL 1.1.1t
8		- o3: OpenSSL 3.0.8
	7	+ o1: OpenSSL 1.1.1t-2
	8	+ o3: OpenSSL 3.0.8-2
9	9
10	10	Platforms:
11	11	w: Windows

		@@ -44,11 +44,11 @@ abbrs:
44	44
45	45	--------------------------------------------------------------------
46	46
47		--- OpenSSL 1.1.1t
	47	+-- OpenSSL 1.1.1t-2
48	48
49	49	conf.o1_1wx3v5 = {
50		- name = "OpenSSL1.1.1t-Windows-x86-VS2015",
51		- opensslVersion = "1.1.1t",
	50	+ name = "OpenSSL1.1.1t-2-Windows-x86-VS2015",
	51	+ opensslVersion = "1.1.1t-2",
52	52	host = "Win8",
53	53	toolchain = "MSVC2015-32",
54	54	libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },

		@@ -64,8 +64,8 @@ conf.o1_1wx3v5 = {
64	64	}
65	65
66	66	conf.o1_1wx3v5st = {
67		- name = "OpenSSL1.1.1t-Windows-x86-VS2015-static",
68		- opensslVersion = "1.1.1t",
	67	+ name = "OpenSSL1.1.1t-2-Windows-x86-VS2015-static",
	68	+ opensslVersion = "1.1.1t-2",
69	69	host = "Win8",
70	70	toolchain = "MSVC2015-32",
71	71	variant = {"-static"},

		@@ -82,8 +82,8 @@ conf.o1_1wx3v5st = {
82	82	}
83	83
84	84	conf.o1_1wx6v5 = {
85		- name = "OpenSSL1.1.1t-Windows-x86_64-VS2015",
86		- opensslVersion = "1.1.1t",
	85	+ name = "OpenSSL1.1.1t-2-Windows-x86_64-VS2015",
	86	+ opensslVersion = "1.1.1t-2",
87	87	host = "Win8",
88	88	toolchain = "MSVC2015-64",
89	89	libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },

		@@ -101,8 +101,8 @@ conf.o1_1wx6v5 = {
101	101	--------------------------------------------------------------------
102	102
103	103	conf.o1_1wx3g7 = {
104		- name = "OpenSSL1.1.1t-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&",
105		- opensslVersion = "1.1.1t",
	104	+ name = "OpenSSL1.1.1t-2-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&",
	105	+ opensslVersion = "1.1.1t-2",
106	106	host = "Win8SH",
107	107	toolchain = "MinGW730-32",
108	108	libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },

		@@ -118,8 +118,8 @@ conf.o1_1wx3g7 = {
118	118	}
119	119
120	120	conf.o1_1wx6g7 = {
121		- name = "OpenSSL1.1.1t-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
122		- opensslVersion = "1.1.1t",
	121	+ name = "OpenSSL1.1.1t-2-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
	122	+ opensslVersion = "1.1.1t-2",
123	123	host = "Win8SH",
124	124	toolchain = "MinGW730-64",
125	125	libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },

		@@ -137,8 +137,8 @@ conf.o1_1wx6g7 = {
137	137	--------------------------------------------------------------------
138	138
139	139	conf.o1_1wx3v7 = {
140		- name = "OpenSSL1.1.1t-Windows-x86-VS2017-&TARGETTOOLVERSION&",
141		- opensslVersion = "1.1.1t",
	140	+ name = "OpenSSL1.1.1t-2-Windows-x86-VS2017-&TARGETTOOLVERSION&",
	141	+ opensslVersion = "1.1.1t-2",
142	142	host = "Win10",
143	143	toolchain = "MSVC2017-32",
144	144	libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },

		@@ -154,8 +154,8 @@ conf.o1_1wx3v7 = {
154	154	}
155	155
156	156	conf.o1_1wx3v7st = {
157		- name = "OpenSSL1.1.1t-Windows-x86-VS2017-&TARGETTOOLVERSION&-static",
158		- opensslVersion = "1.1.1t",
	157	+ name = "OpenSSL1.1.1t-2-Windows-x86-VS2017-&TARGETTOOLVERSION&-static",
	158	+ opensslVersion = "1.1.1t-2",
159	159	host = "Win10",
160	160	toolchain = "MSVC2017-32",
161	161	variant = {"-static"},

		@@ -172,8 +172,8 @@ conf.o1_1wx3v7st = {
172	172	}
173	173
174	174	conf.o1_1wx6v7 = {
175		- name = "OpenSSL1.1.1t-Windows-x86_64-VS2017-&TARGETTOOLVERSION&",
176		- opensslVersion = "1.1.1t",
	175	+ name = "OpenSSL1.1.1t-2-Windows-x86_64-VS2017-&TARGETTOOLVERSION&",
	176	+ opensslVersion = "1.1.1t-2",
177	177	host = "Win10",
178	178	toolchain = "MSVC2017-64",
179	179	libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },

		@@ -191,8 +191,8 @@ conf.o1_1wx6v7 = {
191	191	--------------------------------------------------------------------
192	192
193	193	conf.o1_1wx3v9 = {
194		- name = "OpenSSL1.1.1t-Windows-x86-VS2019-&TARGETTOOLVERSION&",
195		- opensslVersion = "1.1.1t",
	194	+ name = "OpenSSL1.1.1t-2-Windows-x86-VS2019-&TARGETTOOLVERSION&",
	195	+ opensslVersion = "1.1.1t-2",
196	196	host = "Win10",
197	197	toolchain = "MSVC2019-32",
198	198	libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },

		@@ -208,8 +208,8 @@ conf.o1_1wx3v9 = {
208	208	}
209	209
210	210	conf.o1_1wx6v9 = {
211		- name = "OpenSSL1.1.1t-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
212		- opensslVersion = "1.1.1t",
	211	+ name = "OpenSSL1.1.1t-2-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
	212	+ opensslVersion = "1.1.1t-2",
213	213	host = "Win10",
214	214	toolchain = "MSVC2019-64",
215	215	libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },

		@@ -227,8 +227,8 @@ conf.o1_1wx6v9 = {
227	227	--------------------------------------------------------------------
228	228
229	229	conf.o1_1aa3nl = {
230		- name = "OpenSSL1.1.1t-Android-arm-NDKr21eAPI21",
231		- opensslVersion = "1.1.1t",
	230	+ name = "OpenSSL1.1.1t-2-Android-arm-NDKr21eAPI21",
	231	+ opensslVersion = "1.1.1t-2",
232	232	host = "CentOS8",
233	233	target = "Android-21",
234	234	toolchainT = "Android-21-r21e-arm",

		@@ -253,8 +253,8 @@ conf.o1_1aa3nl = {
253	253	}
254	254
255	255	conf.o1_1aa6nl = {
256		- name = "OpenSSL1.1.1t-Android-arm64-NDKr21eAPI21",
257		- opensslVersion = "1.1.1t",
	256	+ name = "OpenSSL1.1.1t-2-Android-arm64-NDKr21eAPI21",
	257	+ opensslVersion = "1.1.1t-2",
258	258	host = "CentOS8",
259	259	target = "Android-21",
260	260	toolchainT = "Android-21-r21e-arm64",

		@@ -274,8 +274,8 @@ conf.o1_1aa6nl = {
274	274	}
275	275
276	276	conf.o1_1ax3nl = {
277		- name = "OpenSSL1.1.1t-Android-x86-NDKr21eAPI21",
278		- opensslVersion = "1.1.1t",
	277	+ name = "OpenSSL1.1.1t-2-Android-x86-NDKr21eAPI21",
	278	+ opensslVersion = "1.1.1t-2",
279	279	host = "CentOS8",
280	280	target = "Android-21",
281	281	toolchainT = "Android-21-r21e-x86",

		@@ -295,8 +295,8 @@ conf.o1_1ax3nl = {
295	295	}
296	296
297	297	conf.o1_1ax6nl = {
298		- name = "OpenSSL1.1.1t-Android-x86_64-NDKr21eAPI21",
299		- opensslVersion = "1.1.1t",
	298	+ name = "OpenSSL1.1.1t-2-Android-x86_64-NDKr21eAPI21",
	299	+ opensslVersion = "1.1.1t-2",
300	300	host = "CentOS8",
301	301	target = "Android-21",
302	302	toolchainT = "Android-21-r21e-x86_64",

		@@ -316,8 +316,8 @@ conf.o1_1ax6nl = {
316	316	}
317	317
318	318	conf.o1_1aalnl = {
319		- name = "OpenSSL1.1.1t-Android-ALL-NDKr21eAPI21",
320		- opensslVersion = "1.1.1t",
	319	+ name = "OpenSSL1.1.1t-2-Android-ALL-NDKr21eAPI21",
	320	+ opensslVersion = "1.1.1t-2",
321	321	host = "CentOS8",
322	322	opensslUnifyType = "Android",
323	323	opensslUnifyArch = {

		@@ -331,8 +331,8 @@ conf.o1_1aalnl = {
331	331	--------------------------------------------------------------------
332	332
333	333	conf.o1_1aa3n321 = {
334		- name = "OpenSSL1.1.1t-Android-arm-NDKr23cAPI21",
335		- opensslVersion = "1.1.1t",
	334	+ name = "OpenSSL1.1.1t-2-Android-arm-NDKr23cAPI21",
	335	+ opensslVersion = "1.1.1t-2",
336	336	host = "CentOS8",
337	337	target = "Android-21",
338	338	toolchainT = "Android-21-r23c-arm",

		@@ -357,8 +357,8 @@ conf.o1_1aa3n321 = {
357	357	}
358	358
359	359	conf.o1_1aa6n321 = {
360		- name = "OpenSSL1.1.1t-Android-arm64-NDKr23cAPI21",
361		- opensslVersion = "1.1.1t",
	360	+ name = "OpenSSL1.1.1t-2-Android-arm64-NDKr23cAPI21",
	361	+ opensslVersion = "1.1.1t-2",
362	362	host = "CentOS8",
363	363	target = "Android-21",
364	364	toolchainT = "Android-21-r23c-arm64",

		@@ -378,8 +378,8 @@ conf.o1_1aa6n321 = {
378	378	}
379	379
380	380	conf.o1_1ax3n321 = {
381		- name = "OpenSSL1.1.1t-Android-x86-NDKr23cAPI21",
382		- opensslVersion = "1.1.1t",
	381	+ name = "OpenSSL1.1.1t-2-Android-x86-NDKr23cAPI21",
	382	+ opensslVersion = "1.1.1t-2",
383	383	host = "CentOS8",
384	384	target = "Android-21",
385	385	toolchainT = "Android-21-r23c-x86",

		@@ -399,8 +399,8 @@ conf.o1_1ax3n321 = {
399	399	}
400	400
401	401	conf.o1_1ax6n321 = {
402		- name = "OpenSSL1.1.1t-Android-x86_64-NDKr23cAPI21",
403		- opensslVersion = "1.1.1t",
	402	+ name = "OpenSSL1.1.1t-2-Android-x86_64-NDKr23cAPI21",
	403	+ opensslVersion = "1.1.1t-2",
404	404	host = "CentOS8",
405	405	target = "Android-21",
406	406	toolchainT = "Android-21-r23c-x86_64",

		@@ -420,8 +420,8 @@ conf.o1_1ax6n321 = {
420	420	}
421	421
422	422	conf.o1_1aaln321 = {
423		- name = "OpenSSL1.1.1t-Android-ALL-NDKr23cAPI21",
424		- opensslVersion = "1.1.1t",
	423	+ name = "OpenSSL1.1.1t-2-Android-ALL-NDKr23cAPI21",
	424	+ opensslVersion = "1.1.1t-2",
425	425	host = "CentOS8",
426	426	opensslUnifyType = "Android",
427	427	opensslUnifyArch = {

		@@ -434,11 +434,11 @@ conf.o1_1aaln321 = {
434	434
435	435	--------------------------------------------------------------------
436	436
437		--- OpenSSL 3.0.8
	437	+-- OpenSSL 3.0.8-2
438	438
439	439	conf.o3_0wx6v9 = {
440		- name = "OpenSSL3.0.8-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
441		- opensslVersion = "3.0.8",
	440	+ name = "OpenSSL3.0.8-2-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
	441	+ opensslVersion = "3.0.8-2",
442	442	host = "Win10",
443	443	toolchain = "MSVC2019-64",
444	444	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -454,8 +454,8 @@ conf.o3_0wx6v9 = {
454	454	}
455	455
456	456	conf.o3_0wx6v9st = {
457		- name = "OpenSSL3.0.8-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static",
458		- opensslVersion = "3.0.8",
	457	+ name = "OpenSSL3.0.8-2-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static",
	458	+ opensslVersion = "3.0.8-2",
459	459	host = "Win10",
460	460	toolchain = "MSVC2019-64",
461	461	variant = {"-static"},

		@@ -472,8 +472,8 @@ conf.o3_0wx6v9st = {
472	472	}
473	473
474	474	conf.o3_0wx6v2 = {
475		- name = "OpenSSL3.0.8-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
476		- opensslVersion = "3.0.8",
	475	+ name = "OpenSSL3.0.8-2-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
	476	+ opensslVersion = "3.0.8-2",
477	477	host = "Win10",
478	478	toolchain = "MSVC2022-64",
479	479	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -489,8 +489,8 @@ conf.o3_0wx6v2 = {
489	489	}
490	490
491	491	conf.o3_0wx6v2st = {
492		- name = "OpenSSL3.0.8-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static",
493		- opensslVersion = "3.0.8",
	492	+ name = "OpenSSL3.0.8-2-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static",
	493	+ opensslVersion = "3.0.8-2",
494	494	host = "Win10",
495	495	toolchain = "MSVC2022-64",
496	496	variant = {"-static"},

		@@ -509,8 +509,8 @@ conf.o3_0wx6v2st = {
509	509	--------------------------------------------------------------------
510	510
511	511	conf.o3_0wx6g1 = {
512		- name = "OpenSSL3.0.8-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
513		- opensslVersion = "3.0.8",
	512	+ name = "OpenSSL3.0.8-2-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
	513	+ opensslVersion = "3.0.8-2",
514	514	host = "Win10SH",
515	515	toolchain = "MinGW1120-64",
516	516	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -527,8 +527,8 @@ conf.o3_0wx6g1 = {
527	527	}
528	528
529	529	conf.o3_0wx6g2 = {
530		- name = "OpenSSL3.0.8-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
531		- opensslVersion = "3.0.8",
	530	+ name = "OpenSSL3.0.8-2-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
	531	+ opensslVersion = "3.0.8-2",
532	532	host = "Win10SH",
533	533	toolchain = "MinGW1210-64",
534	534	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -545,8 +545,8 @@ conf.o3_0wx6g2 = {
545	545	}
546	546
547	547	conf.o3_0wx6u5 = {
548		- name = "OpenSSL3.0.8-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
549		- opensslVersion = "3.0.8",
	548	+ name = "OpenSSL3.0.8-2-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
	549	+ opensslVersion = "3.0.8-2",
550	550	host = "Win10SH",
551	551	toolchain = "MinGWLLVM-ucrt15-64",
552	552	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -564,8 +564,8 @@ conf.o3_0wx6u5 = {
564	564	}
565	565
566	566	conf.o3_0wx6s5 = {
567		- name = "OpenSSL3.0.8-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
568		- opensslVersion = "3.0.8",
	567	+ name = "OpenSSL3.0.8-2-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
	568	+ opensslVersion = "3.0.8-2",
569	569	host = "Win10SH",
570	570	toolchain = "MinGWLLVM-msvcrt15-64",
571	571	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -586,8 +586,8 @@ conf.o3_0wx6s5 = {
586	586
587	587	-- cross build this configuration for easy unify
588	588	conf.o3_0mx6 = {
589		- name = "OpenSSL3.0.8-macOS-x86_64-AppleClang&TARGETTOOLVERSION&",
590		- opensslVersion = "3.0.8",
	589	+ name = "OpenSSL3.0.8-2-macOS-x86_64-AppleClang&TARGETTOOLVERSION&",
	590	+ opensslVersion = "3.0.8-2",
591	591	host = "macOSM1",
592	592	libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
593	593	staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },

		@@ -603,8 +603,8 @@ conf.o3_0mx6 = {
603	603	}
604	604
605	605	conf.o3_0ma6 = {
606		- name = "OpenSSL3.0.8-macOS-arm64_v8a-AppleClang&TARGETTOOLVERSION&",
607		- opensslVersion = "3.0.8",
	606	+ name = "OpenSSL3.0.8-2-macOS-arm64_v8a-AppleClang&TARGETTOOLVERSION&",
	607	+ opensslVersion = "3.0.8-2",
608	608	host = "macOSM1",
609	609	libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
610	610	staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },

		@@ -620,8 +620,8 @@ conf.o3_0ma6 = {
620	620	}
621	621
622	622	conf.o3_0mal = {
623		- name = "OpenSSL3.0.8-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
624		- opensslVersion = "3.0.8",
	623	+ name = "OpenSSL3.0.8-2-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
	624	+ opensslVersion = "3.0.8-2",
625	625	host = "macOSM1",
626	626	libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
627	627	staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },

		@@ -635,8 +635,8 @@ conf.o3_0mal = {
635	635	--------------------------------------------------------------------
636	636
637	637	conf.o3_0aa3n324 = {
638		- name = "OpenSSL3.0.8-Android-arm-NDKr23cAPI24",
639		- opensslVersion = "3.0.8",
	638	+ name = "OpenSSL3.0.8-2-Android-arm-NDKr23cAPI24",
	639	+ opensslVersion = "3.0.8-2",
640	640	host = "CentOS8",
641	641	target = "Android-24",
642	642	toolchainT = "Android-24-r23c-arm",

		@@ -661,8 +661,8 @@ conf.o3_0aa3n324 = {
661	661	}
662	662
663	663	conf.o3_0aa6n324 = {
664		- name = "OpenSSL3.0.8-Android-arm64-NDKr23cAPI24",
665		- opensslVersion = "3.0.8",
	664	+ name = "OpenSSL3.0.8-2-Android-arm64-NDKr23cAPI24",
	665	+ opensslVersion = "3.0.8-2",
666	666	host = "CentOS8",
667	667	target = "Android-24",
668	668	toolchainT = "Android-24-r23c-arm64",

		@@ -682,8 +682,8 @@ conf.o3_0aa6n324 = {
682	682	}
683	683
684	684	conf.o3_0ax3n324 = {
685		- name = "OpenSSL3.0.8-Android-x86-NDKr23cAPI24",
686		- opensslVersion = "3.0.8",
	685	+ name = "OpenSSL3.0.8-2-Android-x86-NDKr23cAPI24",
	686	+ opensslVersion = "3.0.8-2",
687	687	host = "CentOS8",
688	688	target = "Android-24",
689	689	toolchainT = "Android-24-r23c-x86",

		@@ -703,8 +703,8 @@ conf.o3_0ax3n324 = {
703	703	}
704	704
705	705	conf.o3_0ax6n324 = {
706		- name = "OpenSSL3.0.8-Android-x86_64-NDKr23cAPI24",
707		- opensslVersion = "3.0.8",
	706	+ name = "OpenSSL3.0.8-2-Android-x86_64-NDKr23cAPI24",
	707	+ opensslVersion = "3.0.8-2",
708	708	host = "CentOS8",
709	709	target = "Android-24",
710	710	toolchainT = "Android-24-r23c-x86_64",

		@@ -724,8 +724,8 @@ conf.o3_0ax6n324 = {
724	724	}
725	725
726	726	conf.o3_0aaln324 = {
727		- name = "OpenSSL3.0.8-Android-ALL-NDKr23cAPI24",
728		- opensslVersion = "3.0.8",
	727	+ name = "OpenSSL3.0.8-2-Android-ALL-NDKr23cAPI24",
	728	+ opensslVersion = "3.0.8-2",
729	729	host = "CentOS8",
730	730	opensslUnifyType = "Android",
731	731	opensslUnifyArch = {

		@@ -738,8 +738,8 @@ conf.o3_0aaln324 = {
738	738	--------------------------------------------------------------------
739	739
740	740	conf.o3_0aa3n527 = {
741		- name = "OpenSSL3.0.8-Android-arm-NDKr25API27",
742		- opensslVersion = "3.0.8",
	741	+ name = "OpenSSL3.0.8-2-Android-arm-NDKr25API27",
	742	+ opensslVersion = "3.0.8-2",
743	743	host = "Rocky9",
744	744	target = "Android-27",
745	745	toolchainT = "Android-27-r25c-arm",

		@@ -764,8 +764,8 @@ conf.o3_0aa3n527 = {
764	764	}
765	765
766	766	conf.o3_0aa6n527 = {
767		- name = "OpenSSL3.0.8-Android-arm64-NDKr25API27",
768		- opensslVersion = "3.0.8",
	767	+ name = "OpenSSL3.0.8-2-Android-arm64-NDKr25API27",
	768	+ opensslVersion = "3.0.8-2",
769	769	host = "Rocky9",
770	770	target = "Android-27",
771	771	toolchainT = "Android-27-r25c-arm64",

		@@ -785,8 +785,8 @@ conf.o3_0aa6n527 = {
785	785	}
786	786
787	787	conf.o3_0ax3n527 = {
788		- name = "OpenSSL3.0.8-Android-x86-NDKr25API27",
789		- opensslVersion = "3.0.8",
	788	+ name = "OpenSSL3.0.8-2-Android-x86-NDKr25API27",
	789	+ opensslVersion = "3.0.8-2",
790	790	host = "Rocky9",
791	791	target = "Android-27",
792	792	toolchainT = "Android-27-r25c-x86",

		@@ -806,8 +806,8 @@ conf.o3_0ax3n527 = {
806	806	}
807	807
808	808	conf.o3_0ax6n527 = {
809		- name = "OpenSSL3.0.8-Android-x86_64-NDKr25API27",
810		- opensslVersion = "3.0.8",
	809	+ name = "OpenSSL3.0.8-2-Android-x86_64-NDKr25API27",
	810	+ opensslVersion = "3.0.8-2",
811	811	host = "Rocky9",
812	812	target = "Android-27",
813	813	toolchainT = "Android-27-r25c-x86_64",

		@@ -827,8 +827,8 @@ conf.o3_0ax6n527 = {
827	827	}
828	828
829	829	conf.o3_0aaln527 = {
830		- name = "OpenSSL3.0.8-Android-ALL-NDKr25API27",
831		- opensslVersion = "3.0.8",
	830	+ name = "OpenSSL3.0.8-2-Android-ALL-NDKr25API27",
	831	+ opensslVersion = "3.0.8-2",
832	832	host = "Rocky9",
833	833	opensslUnifyType = "Android",
834	834	opensslUnifyArch = {

--- a/Compile/lib/qtCompile/conf.lua

+++ b/Compile/lib/qtCompile/conf.lua

		@@ -7,7 +7,7 @@ abbrs:
7	7	q5_12: Qt 5.12.12/Discontinued Qt 5 LTS
8	8	q5_15: Qt 5.15.8/Previous Qt 5 LTS w/ latest QtWebEngine and latest QtScript
9	9	q6_2: Qt 6.2.4/Latest Qt 6 LTS w/ latest QtWebEngine
10		- q6_4: Qt 6.4.2
	10	+ q6_4: Qt 6.4.3
11	11	q6_5: Qt 6.5.0 (Pre-release)
12	12	If prefixed with a lower-case "m", it is a modified Qt version
13	13

		@@ -3807,8 +3807,8 @@ conf.q6_2mal_W = {
3807	3807	--------------------------------------------------------------------
3808	3808
3809	3809	conf.q6_4wx6v9 = {
3810		- name = "Qt6.4.2-Windows-x86_64-VS2019-&HOSTTOOLVERSION&",
3811		- qtVersion = "6.4.2",
	3810	+ name = "Qt6.4.3-Windows-x86_64-VS2019-&HOSTTOOLVERSION&",
	3811	+ qtVersion = "6.4.3",
3812	3812	host = "Win10",
3813	3813	toolchain = "MSVC2019-64",
3814	3814	opensslConf = "o3_0wx6v9",

		@@ -3847,8 +3847,8 @@ conf.q6_4wx6v9 = {
3847	3847	}
3848	3848
3849	3849	conf.q6_4wx6v2 = {
3850		- name = "Qt6.4.2-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
3851		- qtVersion = "6.4.2",
	3850	+ name = "Qt6.4.3-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
	3851	+ qtVersion = "6.4.3",
3852	3852	host = "Win10",
3853	3853	toolchain = "MSVC2022-64",
3854	3854	opensslConf = "o3_0wx6v2",

		@@ -3887,8 +3887,8 @@ conf.q6_4wx6v2 = {
3887	3887	}
3888	3888
3889	3889	conf.q6_4wx6v2st = {
3890		- name = "Qt6.4.2-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
3891		- qtVersion = "6.4.2",
	3890	+ name = "Qt6.4.3-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
	3891	+ qtVersion = "6.4.3",
3892	3892	host = "Win10",
3893	3893	toolchain = "MSVC2022-64",
3894	3894	variant = {"-static"},

		@@ -3946,8 +3946,8 @@ conf.q6_4wx6v2st = {
3946	3946	}
3947	3947
3948	3948	conf.q6_4wx6v2_wa6v2 = {
3949		- name = "Qt6.4.2-Windows-arm64-VS2022-&HOSTTOOLVERSION&-XWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
3950		- qtVersion = "6.4.2",
	3949	+ name = "Qt6.4.3-Windows-arm64-VS2022-&HOSTTOOLVERSION&-XWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
	3950	+ qtVersion = "6.4.3",
3951	3951	host = "Win10",
3952	3952	target = "Win10Arm",
3953	3953	toolchain = "MSVC2022-64", -- only a placeholder here, in fact it uses "toolchainT" instead of "toolchain"

		@@ -3982,8 +3982,8 @@ conf.q6_4wx6v2_wa6v2 = {
3982	3982	}
3983	3983
3984	3984	conf.q6_4wx6g2 = {
3985		- name = "Qt6.4.2-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
3986		- qtVersion = "6.4.2",
	3985	+ name = "Qt6.4.3-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
	3986	+ qtVersion = "6.4.3",
3987	3987	host = "Win10",
3988	3988	toolchain = "MinGW1210-64",
3989	3989	opensslConf = "o3_0wx6g2",

		@@ -4020,8 +4020,8 @@ conf.q6_4wx6g2 = {
4020	4020	}
4021	4021
4022	4022	conf.q6_4wx6g2st = {
4023		- name = "Qt6.4.2-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static",
4024		- qtVersion = "6.4.2",
	4023	+ name = "Qt6.4.3-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static",
	4024	+ qtVersion = "6.4.3",
4025	4025	host = "Win10",
4026	4026	toolchain = "MinGW1210-64",
4027	4027	variant = {"-static"},

		@@ -4080,8 +4080,8 @@ conf.q6_4wx6g2st = {
4080	4080	}
4081	4081
4082	4082	conf.q6_4wx6u5 = {
4083		- name = "Qt6.4.2-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
4084		- qtVersion = "6.4.2",
	4083	+ name = "Qt6.4.3-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
	4084	+ qtVersion = "6.4.3",
4085	4085	host = "Win10",
4086	4086	toolchain = "MinGWLLVM-ucrt15-64",
4087	4087	opensslConf = "o3_0wx6u5",

		@@ -4122,8 +4122,8 @@ conf.q6_4wx6u5 = {
4122	4122	}
4123	4123
4124	4124	conf.q6_4wx6s5 = {
4125		- name = "Qt6.4.2-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
4126		- qtVersion = "6.4.2",
	4125	+ name = "Qt6.4.3-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
	4126	+ qtVersion = "6.4.3",
4127	4127	host = "Win10",
4128	4128	toolchain = "MinGWLLVM-msvcrt15-64",
4129	4129	opensslConf = "o3_0wx6s5",

		@@ -4164,8 +4164,8 @@ conf.q6_4wx6s5 = {
4164	4164	}
4165	4165
4166	4166	conf.q6_4lx6st = {
4167		- name = "Qt6.4.2-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
4168		- qtVersion = "6.4.2",
	4167	+ name = "Qt6.4.3-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
	4168	+ qtVersion = "6.4.3",
4169	4169	host = "Rocky9",
4170	4170	variant = {"-static"},
4171	4171	useCMake = "Latest",

		@@ -4217,8 +4217,8 @@ conf.q6_4lx6st = {
4217	4217	}
4218	4218
4219	4219	conf.q6_4mal = {
4220		- name = "Qt6.4.2-macOS-Universal-AppleClang&HOSTTOOLVERSION&",
4221		- qtVersion = "6.4.2",
	4220	+ name = "Qt6.4.3-macOS-Universal-AppleClang&HOSTTOOLVERSION&",
	4221	+ qtVersion = "6.4.3",
4222	4222	host = "macOSM1",
4223	4223	opensslConf = "o3_0mal",
4224	4224	mysqlConf = "m3_3mal",

		@@ -4260,8 +4260,8 @@ conf.q6_4mal = {
4260	4260	}
4261	4261
4262	4262	conf.q6_4malnf = {
4263		- name = "Qt6.4.2-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework",
4264		- qtVersion = "6.4.2",
	4263	+ name = "Qt6.4.3-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework",
	4264	+ qtVersion = "6.4.3",
4265	4265	host = "macOSM1",
4266	4266	variant = {"-noFramework"},
4267	4267	opensslConf = "o3_0mal",

		@@ -4304,8 +4304,8 @@ conf.q6_4malnf = {
4304	4304	}
4305	4305
4306	4306	conf.q6_4malst = {
4307		- name = "Qt6.4.2-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static",
4308		- qtVersion = "6.4.2",
	4307	+ name = "Qt6.4.3-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static",
	4308	+ qtVersion = "6.4.3",
4309	4309	host = "macOSM1",
4310	4310	variant = {"-static"},
4311	4311	opensslConf = "o3_0mal",

		@@ -4363,8 +4363,8 @@ conf.q6_4malst = {
4363	4363	}
4364	4364
4365	4365	conf.q6_4wx6g2_aa6n5 = {
4366		- name = "Qt6.4.2-Android-arm64-Clang-NDKr25c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
4367		- qtVersion = "6.4.2",
	4366	+ name = "Qt6.4.3-Android-arm64-Clang-NDKr25c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
	4367	+ qtVersion = "6.4.3",
4368	4368	host = "Win10",
4369	4369	target = "Android-27",
4370	4370	toolchain = "MinGW1210-64",

		@@ -4402,8 +4402,8 @@ conf.q6_4wx6g2_aa6n5 = {
4402	4402	}
4403	4403
4404	4404	conf.q6_4wx6g2_ax6n5 = {
4405		- name = "Qt6.4.2-Android-x86_64-Clang-NDKr25c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
4406		- qtVersion = "6.4.2",
	4405	+ name = "Qt6.4.3-Android-x86_64-Clang-NDKr25c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
	4406	+ qtVersion = "6.4.3",
4407	4407	host = "Win10",
4408	4408	target = "Android-27",
4409	4409	toolchain = "MinGW1210-64",

		@@ -4441,8 +4441,8 @@ conf.q6_4wx6g2_ax6n5 = {
4441	4441	}
4442	4442
4443	4443	conf.q6_4lx6_aa6n5 = {
4444		- name = "Qt6.4.2-Android-arm64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
4445		- qtVersion = "6.4.2",
	4444	+ name = "Qt6.4.3-Android-arm64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	4445	+ qtVersion = "6.4.3",
4446	4446	host = "Rocky9",
4447	4447	target = "Android-27",
4448	4448	toolchainT = "Android-27-r25c-arm64",

		@@ -4478,8 +4478,8 @@ conf.q6_4lx6_aa6n5 = {
4478	4478	}
4479	4479
4480	4480	conf.q6_4lx6_ax6n5 = {
4481		- name = "Qt6.4.2-Android-x86_64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
4482		- qtVersion = "6.4.2",
	4481	+ name = "Qt6.4.3-Android-x86_64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	4482	+ qtVersion = "6.4.3",
4483	4483	host = "Rocky9",
4484	4484	target = "Android-27",
4485	4485	toolchainT = "Android-27-r25c-x86_64",

		@@ -4515,8 +4515,8 @@ conf.q6_4lx6_ax6n5 = {
4515	4515	}
4516	4516
4517	4517	conf.q6_4mal_aa6n5 = {
4518		- name = "Qt6.4.2-Android-arm64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
4519		- qtVersion = "6.4.2",
	4518	+ name = "Qt6.4.3-Android-arm64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	4519	+ qtVersion = "6.4.3",
4520	4520	host = "macOSM1",
4521	4521	target = "Android-27",
4522	4522	toolchainT = "Android-27-r25c-arm64",

		@@ -4552,8 +4552,8 @@ conf.q6_4mal_aa6n5 = {
4552	4552	}
4553	4553
4554	4554	conf.q6_4mal_ax6n5 = {
4555		- name = "Qt6.4.2-Android-x86_64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
4556		- qtVersion = "6.4.2",
	4555	+ name = "Qt6.4.3-Android-x86_64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	4556	+ qtVersion = "6.4.3",
4557	4557	host = "macOSM1",
4558	4558	target = "Android-27",
4559	4559	toolchainT = "Android-27-r25c-x86_64",

		@@ -4590,8 +4590,8 @@ conf.q6_4mal_ax6n5 = {
4590	4590
4591	4591	-- WebAssembly uses emcmake which don't need a toolchain file
4592	4592	conf.q6_4wx6g2_W = {
4593		- name = "Qt6.4.2-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
4594		- qtVersion = "6.4.2",
	4593	+ name = "Qt6.4.3-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
	4594	+ qtVersion = "6.4.3",
4595	4595	host = "Win10",
4596	4596	toolchain = "MinGW1210-64",
4597	4597	target = "WebAssembly",

		@@ -4623,8 +4623,8 @@ conf.q6_4wx6g2_W = {
4623	4623	}
4624	4624
4625	4625	conf.q6_4lx6_W = {
4626		- name = "Qt6.4.2-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
4627		- qtVersion = "6.4.2",
	4626	+ name = "Qt6.4.3-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	4627	+ qtVersion = "6.4.3",
4628	4628	host = "Rocky9",
4629	4629	target = "WebAssembly",
4630	4630	toolchainT = "emscripten-3.1.14",

		@@ -4653,8 +4653,8 @@ conf.q6_4lx6_W = {
4653	4653	}
4654	4654
4655	4655	conf.q6_4mal_W = {
4656		- name = "Qt6.4.2-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
4657		- qtVersion = "6.4.2",
	4656	+ name = "Qt6.4.3-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	4657	+ qtVersion = "6.4.3",
4658	4658	host = "macOSM1",
4659	4659	target = "WebAssembly",
4660	4660	toolchainT = "emscripten-3.1.14",

		@@ -4685,8 +4685,8 @@ conf.q6_4mal_W = {
4685	4685	--------------------------------------------------------------------
4686	4686
4687	4687	conf.q6_5wx6v2 = {
4688		- name = "Qt6.5.0-beta3-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
4689		- qtVersion = "6.5.0-beta3",
	4688	+ name = "Qt6.5.0-rc-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
	4689	+ qtVersion = "6.5.0-rc",
4690	4690	host = "Win10",
4691	4691	toolchain = "MSVC2022-64",
4692	4692	opensslConf = "o3_0wx6v2",

		@@ -4726,8 +4726,8 @@ conf.q6_5wx6v2 = {
4726	4726	}
4727	4727
4728	4728	conf.q6_5wx6v2st = {
4729		- name = "Qt6.5.0-beta3-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
4730		- qtVersion = "6.5.0-beta3",
	4729	+ name = "Qt6.5.0-rc-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
	4730	+ qtVersion = "6.5.0-rc",
4731	4731	host = "Win10",
4732	4732	toolchain = "MSVC2022-64",
4733	4733	variant = {"-static"},

		@@ -4791,8 +4791,8 @@ conf.q6_5wx6v2st = {
4791	4791	}
4792	4792
4793	4793	conf.q6_5wx6v2sf = {
4794		- name = "Qt6.5.0-beta3-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-staticFull",
4795		- qtVersion = "6.5.0-beta3",
	4794	+ name = "Qt6.5.0-rc-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-staticFull",
	4795	+ qtVersion = "6.5.0-rc",
4796	4796	host = "Win10",
4797	4797	toolchain = "MSVC2022-64",
4798	4798	variant = {"-staticFull"},

		@@ -4831,8 +4831,8 @@ conf.q6_5wx6v2sf = {
4831	4831	}
4832	4832
4833	4833	conf.q6_5wx6v2_wa6v2 = {
4834		- name = "Qt6.5.0-beta3-Windows-arm64-VS2022-&HOSTTOOLVERSION&-XWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
4835		- qtVersion = "6.5.0-beta3",
	4834	+ name = "Qt6.5.0-rc-Windows-arm64-VS2022-&HOSTTOOLVERSION&-XWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
	4835	+ qtVersion = "6.5.0-rc",
4836	4836	host = "Win10",
4837	4837	target = "Win10Arm",
4838	4838	toolchain = "MSVC2022-64", -- only a placeholder here, in fact it uses "toolchainT" instead of "toolchain"

		@@ -4868,8 +4868,8 @@ conf.q6_5wx6v2_wa6v2 = {
4868	4868	}
4869	4869
4870	4870	conf.q6_5wx6g2 = {
4871		- name = "Qt6.5.0-beta3-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
4872		- qtVersion = "6.5.0-beta3",
	4871	+ name = "Qt6.5.0-rc-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
	4872	+ qtVersion = "6.5.0-rc",
4873	4873	host = "Win10",
4874	4874	toolchain = "MinGW1210-64",
4875	4875	opensslConf = "o3_0wx6g2",

		@@ -4907,8 +4907,8 @@ conf.q6_5wx6g2 = {
4907	4907	}
4908	4908
4909	4909	conf.q6_5wx6g2st = {
4910		- name = "Qt6.5.0-beta3-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static",
4911		- qtVersion = "6.5.0-beta3",
	4910	+ name = "Qt6.5.0-rc-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static",
	4911	+ qtVersion = "6.5.0-rc",
4912	4912	host = "Win10",
4913	4913	toolchain = "MinGW1210-64",
4914	4914	variant = {"-static"},

		@@ -4973,8 +4973,8 @@ conf.q6_5wx6g2st = {
4973	4973	}
4974	4974
4975	4975	conf.q6_5wx6g2sf = {
4976		- name = "Qt6.5.0-beta3-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull",
4977		- qtVersion = "6.5.0-beta3",
	4976	+ name = "Qt6.5.0-rc-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull",
	4977	+ qtVersion = "6.5.0-rc",
4978	4978	host = "Win10",
4979	4979	toolchain = "MinGW1210-64",
4980	4980	variant = {"-staticFull"},

		@@ -5014,8 +5014,8 @@ conf.q6_5wx6g2sf = {
5014	5014	}
5015	5015
5016	5016	conf.q6_5wx6u5 = {
5017		- name = "Qt6.5.0-beta3-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
5018		- qtVersion = "6.5.0-beta3",
	5017	+ name = "Qt6.5.0-rc-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
	5018	+ qtVersion = "6.5.0-rc",
5019	5019	host = "Win10",
5020	5020	toolchain = "MinGWLLVM-ucrt15-64",
5021	5021	opensslConf = "o3_0wx6u5",

		@@ -5057,8 +5057,8 @@ conf.q6_5wx6u5 = {
5057	5057	}
5058	5058
5059	5059	conf.q6_5wx6s5 = {
5060		- name = "Qt6.5.0-beta3-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
5061		- qtVersion = "6.5.0-beta3",
	5060	+ name = "Qt6.5.0-rc-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
	5061	+ qtVersion = "6.5.0-rc",
5062	5062	host = "Win10",
5063	5063	toolchain = "MinGWLLVM-msvcrt15-64",
5064	5064	opensslConf = "o3_0wx6s5",

		@@ -5100,8 +5100,8 @@ conf.q6_5wx6s5 = {
5100	5100	}
5101	5101
5102	5102	conf.q6_5lx6st = {
5103		- name = "Qt6.5.0-beta3-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
5104		- qtVersion = "6.5.0-beta3",
	5103	+ name = "Qt6.5.0-rc-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
	5104	+ qtVersion = "6.5.0-rc",
5105	5105	host = "Rocky9",
5106	5106	variant = {"-static"},
5107	5107	useCMake = "Latest",

		@@ -5159,8 +5159,8 @@ conf.q6_5lx6st = {
5159	5159	}
5160	5160
5161	5161	conf.q6_5mal = {
5162		- name = "Qt6.5.0-beta3-macOS-Universal-AppleClang&HOSTTOOLVERSION&",
5163		- qtVersion = "6.5.0-beta3",
	5162	+ name = "Qt6.5.0-rc-macOS-Universal-AppleClang&HOSTTOOLVERSION&",
	5163	+ qtVersion = "6.5.0-rc",
5164	5164	host = "macOSM1",
5165	5165	opensslConf = "o3_0mal",
5166	5166	mysqlConf = "m3_3mal",

		@@ -5203,8 +5203,8 @@ conf.q6_5mal = {
5203	5203	}
5204	5204
5205	5205	conf.q6_5malnf = {
5206		- name = "Qt6.5.0-beta3-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework",
5207		- qtVersion = "6.5.0-beta3",
	5206	+ name = "Qt6.5.0-rc-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework",
	5207	+ qtVersion = "6.5.0-rc",
5208	5208	host = "macOSM1",
5209	5209	variant = {"-noFramework"},
5210	5210	opensslConf = "o3_0mal",

		@@ -5248,8 +5248,8 @@ conf.q6_5malnf = {
5248	5248	}
5249	5249
5250	5250	conf.q6_5malst = {
5251		- name = "Qt6.5.0-beta3-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static",
5252		- qtVersion = "6.5.0-beta3",
	5251	+ name = "Qt6.5.0-rc-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static",
	5252	+ qtVersion = "6.5.0-rc",
5253	5253	host = "macOSM1",
5254	5254	variant = {"-static"},
5255	5255	opensslConf = "o3_0mal",

		@@ -5313,8 +5313,8 @@ conf.q6_5malst = {
5313	5313	}
5314	5314
5315	5315	conf.q6_5malsf = {
5316		- name = "Qt6.5.0-beta3-macOS-Universal-AppleClang&HOSTTOOLVERSION&-staticFull",
5317		- qtVersion = "6.5.0-beta3",
	5316	+ name = "Qt6.5.0-rc-macOS-Universal-AppleClang&HOSTTOOLVERSION&-staticFull",
	5317	+ qtVersion = "6.5.0-rc",
5318	5318	host = "macOSM1",
5319	5319	variant = {"-staticFull"},
5320	5320	opensslConf = "o3_0mal",

		@@ -5353,8 +5353,8 @@ conf.q6_5malsf = {
5353	5353	}
5354	5354
5355	5355	conf.q6_5wx6g2_aa6n5 = {
5356		- name = "Qt6.5.0-beta3-Android-arm64-Clang-NDKr25c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
5357		- qtVersion = "6.5.0-beta3",
	5356	+ name = "Qt6.5.0-rc-Android-arm64-Clang-NDKr25c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
	5357	+ qtVersion = "6.5.0-rc",
5358	5358	host = "Win10",
5359	5359	target = "Android-27",
5360	5360	toolchain = "MinGW1210-64",

		@@ -5393,8 +5393,8 @@ conf.q6_5wx6g2_aa6n5 = {
5393	5393	}
5394	5394
5395	5395	conf.q6_5wx6g2_ax6n5 = {
5396		- name = "Qt6.5.0-beta3-Android-x86_64-Clang-NDKr25c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
5397		- qtVersion = "6.5.0-beta3",
	5396	+ name = "Qt6.5.0-rc-Android-x86_64-Clang-NDKr25c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
	5397	+ qtVersion = "6.5.0-rc",
5398	5398	host = "Win10",
5399	5399	target = "Android-27",
5400	5400	toolchain = "MinGW1210-64",

		@@ -5433,8 +5433,8 @@ conf.q6_5wx6g2_ax6n5 = {
5433	5433	}
5434	5434
5435	5435	conf.q6_5lx6_aa6n5 = {
5436		- name = "Qt6.5.0-beta3-Android-arm64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5437		- qtVersion = "6.5.0-beta3",
	5436	+ name = "Qt6.5.0-rc-Android-arm64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	5437	+ qtVersion = "6.5.0-rc",
5438	5438	host = "Rocky9",
5439	5439	target = "Android-27",
5440	5440	toolchainT = "Android-27-r25c-arm64",

		@@ -5471,8 +5471,8 @@ conf.q6_5lx6_aa6n5 = {
5471	5471	}
5472	5472
5473	5473	conf.q6_5lx6_ax6n5 = {
5474		- name = "Qt6.5.0-beta3-Android-x86_64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5475		- qtVersion = "6.5.0-beta3",
	5474	+ name = "Qt6.5.0-rc-Android-x86_64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	5475	+ qtVersion = "6.5.0-rc",
5476	5476	host = "Rocky9",
5477	5477	target = "Android-27",
5478	5478	toolchainT = "Android-27-r25c-x86_64",

		@@ -5509,8 +5509,8 @@ conf.q6_5lx6_ax6n5 = {
5509	5509	}
5510	5510
5511	5511	conf.q6_5mal_aa6n5 = {
5512		- name = "Qt6.5.0-beta3-Android-arm64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
5513		- qtVersion = "6.5.0-beta3",
	5512	+ name = "Qt6.5.0-rc-Android-arm64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	5513	+ qtVersion = "6.5.0-rc",
5514	5514	host = "macOSM1",
5515	5515	target = "Android-27",
5516	5516	toolchainT = "Android-27-r25c-arm64",

		@@ -5547,8 +5547,8 @@ conf.q6_5mal_aa6n5 = {
5547	5547	}
5548	5548
5549	5549	conf.q6_5mal_ax6n5 = {
5550		- name = "Qt6.5.0-beta3-Android-x86_64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
5551		- qtVersion = "6.5.0-beta3",
	5550	+ name = "Qt6.5.0-rc-Android-x86_64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	5551	+ qtVersion = "6.5.0-rc",
5552	5552	host = "macOSM1",
5553	5553	target = "Android-27",
5554	5554	toolchainT = "Android-27-r25c-x86_64",

		@@ -5586,8 +5586,8 @@ conf.q6_5mal_ax6n5 = {
5586	5586
5587	5587	-- WebAssembly uses emcmake which don't need a toolchain file
5588	5588	conf.q6_5wx6g2_W = {
5589		- name = "Qt6.5.0-beta3-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
5590		- qtVersion = "6.5.0-beta3",
	5589	+ name = "Qt6.5.0-rc-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
	5590	+ qtVersion = "6.5.0-rc",
5591	5591	host = "Win10",
5592	5592	toolchain = "MinGW1210-64",
5593	5593	target = "WebAssembly",

		@@ -5618,8 +5618,8 @@ conf.q6_5wx6g2_W = {
5618	5618	}
5619	5619
5620	5620	conf.q6_5lx6_W = {
5621		- name = "Qt6.5.0-beta3-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5622		- qtVersion = "6.5.0-beta3",
	5621	+ name = "Qt6.5.0-rc-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	5622	+ qtVersion = "6.5.0-rc",
5623	5623	host = "Rocky9",
5624	5624	target = "WebAssembly",
5625	5625	toolchainT = "emscripten-3.1.25",

		@@ -5649,8 +5649,8 @@ conf.q6_5lx6_W = {
5649	5649	}
5650	5650
5651	5651	conf.q6_5mal_W = {
5652		- name = "Qt6.5.0-beta3-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
5653		- qtVersion = "6.5.0-beta3",
	5652	+ name = "Qt6.5.0-rc-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	5653	+ qtVersion = "6.5.0-rc",
5654	5654	host = "macOSM1",
5655	5655	target = "WebAssembly",
5656	5656	toolchainT = "emscripten-3.1.25",

		@@ -5701,27 +5701,27 @@ setmetatable(QQtPatcherVersion, versionMo)
5701	5701	local Qt6StaticConf = {
5702	5702	Win10 = {
5703	5703	["6.2.4"] = "q6_2wx6g1st",
5704		- ["6.4.2"] = "q6_4wx6g2st",
5705		- ["6.5.0-beta3"] = "q6_5wx6g2st",
	5704	+ ["6.4.3"] = "q6_4wx6g2st",
	5705	+ ["6.5.0-rc"] = "q6_5wx6g2st",
5706	5706	},
5707	5707	Win10MSVC2019 = {
5708	5708	["6.2.4"] = "q6_2wx6v9st",
5709	5709	},
5710	5710	Win10MSVC2022 = {
5711		- ["6.4.2"] = "q6_4wx6v2st",
5712		- ["6.5.0-beta3"] = "q6_5wx6v2st",
	5711	+ ["6.4.3"] = "q6_4wx6v2st",
	5712	+ ["6.5.0-rc"] = "q6_5wx6v2st",
5713	5713	},
5714	5714	CentOS8 = {
5715	5715	["6.2.4"] = "q6_2lx6st",
5716	5716	},
5717	5717	Rocky9 = {
5718		- ["6.4.2"] = "q6_4lx6st",
5719		- ["6.5.0-beta3"] = "q6_5lx6st",
	5718	+ ["6.4.3"] = "q6_4lx6st",
	5719	+ ["6.5.0-rc"] = "q6_5lx6st",
5720	5720	},
5721	5721	macOSM1 = {
5722	5722	["6.2.4"] = "q6_2malst",
5723		- ["6.4.2"] = "q6_4malst",
5724		- ["6.5.0-beta3"] = "q6_5malst",
	5723	+ ["6.4.3"] = "q6_4malst",
	5724	+ ["6.5.0-rc"] = "q6_5malst",
5725	5725	},
5726	5726	}
5727	5727

		@@ -5766,8 +5766,8 @@ local valueMo = {
5766	5766	local Win10SrcPackagePrefixWorkaroundVersions = {
5767	5767	"5.15.8-5",
5768	5768	"6.2.4",
5769		- "6.4.2",
5770		- "6.5.0-beta3",
	5769	+ "6.4.3",
	5770	+ "6.5.0-rc",
5771	5771	}
5772	5772
5773	5773	for name, value in pairs(conf) do

Fs-scripts Fork