• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revisionbba50b13d95cc46a2f51132f04af5a61fd292d19 (tree)
Time2022-09-02 13:28:48
AuthorFs <Fsu0413@vip....>
CommiterFs

Log Message

6.4.0-beta4

Change Summary

Incremental Difference

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -5144,8 +5144,8 @@ conf.q6_3ma6_W = {
51445144 --------------------------------------------------------------------
51455145
51465146 conf.q6_4wx6v9 = {
5147- name = "Qt6.4.0-beta3-Windows-x86_64-VS2019-&HOSTTOOLVERSION&",
5148- qtVersion = "6.4.0-beta3",
5147+ name = "Qt6.4.0-beta4-Windows-x86_64-VS2019-&HOSTTOOLVERSION&",
5148+ qtVersion = "6.4.0-beta4",
51495149 host = "Win10",
51505150 toolchain = "MSVC2019-64",
51515151 opensslConf = "o3wx6v9",
@@ -5179,8 +5179,8 @@ conf.q6_4wx6v9 = {
51795179 }
51805180
51815181 conf.q6_4wx6v2 = {
5182- name = "Qt6.4.0-beta3-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
5183- qtVersion = "6.4.0-beta3",
5182+ name = "Qt6.4.0-beta4-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
5183+ qtVersion = "6.4.0-beta4",
51845184 host = "Win10",
51855185 toolchain = "MSVC2022-64",
51865186 opensslConf = "o3wx6v2",
@@ -5214,8 +5214,8 @@ conf.q6_4wx6v2 = {
52145214 }
52155215
52165216 conf.q6_4wx6v2st = {
5217- name = "Qt6.4.0-beta3-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
5218- qtVersion = "6.4.0-beta3",
5217+ name = "Qt6.4.0-beta4-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
5218+ qtVersion = "6.4.0-beta4",
52195219 host = "Win10",
52205220 toolchain = "MSVC2022-64",
52215221 variant = {"-static"},
@@ -5271,8 +5271,8 @@ conf.q6_4wx6v2st = {
52715271 }
52725272
52735273 conf.q6_4wx6v2_wa6v2 = {
5274- name = "Qt6.4.0-beta3-Windows-arm64-VS2022-&HOSTTOOLVERSION&-XWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
5275- qtVersion = "6.4.0-beta3",
5274+ name = "Qt6.4.0-beta4-Windows-arm64-VS2022-&HOSTTOOLVERSION&-XWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
5275+ qtVersion = "6.4.0-beta4",
52765276 host = "Win10",
52775277 target = "Win10Arm",
52785278 toolchain = "MSVC2022-64", -- only a placeholder here, in fact it uses "toolchainT" instead of "toolchain"
@@ -5307,8 +5307,8 @@ conf.q6_4wx6v2_wa6v2 = {
53075307 }
53085308
53095309 conf.q6_4wx6g2 = {
5310- name = "Qt6.4.0-beta3-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
5311- qtVersion = "6.4.0-beta3",
5310+ name = "Qt6.4.0-beta4-Windows-x86_64-MinGW&HOSTTOOLVERSION&",
5311+ qtVersion = "6.4.0-beta4",
53125312 host = "Win10",
53135313 toolchain = "MinGW1210-64",
53145314 opensslConf = "o3wx6m2",
@@ -5341,8 +5341,8 @@ conf.q6_4wx6g2 = {
53415341 }
53425342
53435343 conf.q6_4wx6g2st = {
5344- name = "Qt6.4.0-beta3-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static",
5345- qtVersion = "6.4.0-beta3",
5344+ name = "Qt6.4.0-beta4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static",
5345+ qtVersion = "6.4.0-beta4",
53465346 host = "Win10",
53475347 toolchain = "MinGW1210-64",
53485348 variant = {"-static"},
@@ -5399,8 +5399,8 @@ conf.q6_4wx6g2st = {
53995399 }
54005400
54015401 conf.q6_4wx6u4 = {
5402- name = "Qt6.4.0-beta3-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
5403- qtVersion = "6.4.0-beta3",
5402+ name = "Qt6.4.0-beta4-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
5403+ qtVersion = "6.4.0-beta4",
54045404 host = "Win10",
54055405 toolchain = "MinGWLLVM-ucrt14-64",
54065406 opensslConf = "o3wx6mu",
@@ -5438,8 +5438,8 @@ conf.q6_4wx6u4 = {
54385438 }
54395439
54405440 conf.q6_4wx6m4 = {
5441- name = "Qt6.4.0-beta3-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
5442- qtVersion = "6.4.0-beta3",
5441+ name = "Qt6.4.0-beta4-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
5442+ qtVersion = "6.4.0-beta4",
54435443 host = "Win10",
54445444 toolchain = "MinGWLLVM-msvcrt14-64",
54455445 opensslConf = "o3wx6mv",
@@ -5477,8 +5477,8 @@ conf.q6_4wx6m4 = {
54775477 }
54785478
54795479 conf.q6_4lx6st = {
5480- name = "Qt6.4.0-beta3-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
5481- qtVersion = "6.4.0-beta3",
5480+ name = "Qt6.4.0-beta4-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
5481+ qtVersion = "6.4.0-beta4",
54825482 host = "Rocky9",
54835483 variant = {"-static"},
54845484 useCMake = "Latest",
@@ -5529,8 +5529,8 @@ conf.q6_4lx6st = {
55295529 }
55305530
55315531 conf.q6_4mx6 = {
5532- name = "Qt6.4.0-beta3-macOS-x86_64-AppleClang&HOSTTOOLVERSION&",
5533- qtVersion = "6.4.0-beta3",
5532+ name = "Qt6.4.0-beta4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&",
5533+ qtVersion = "6.4.0-beta4",
55345534 host = "macOS1015",
55355535 opensslConf = "o3mx6",
55365536 useCMake = "Latest",
@@ -5567,8 +5567,8 @@ conf.q6_4mx6 = {
55675567 }
55685568
55695569 conf.q6_4mx6nf = {
5570- name = "Qt6.4.0-beta3-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework",
5571- qtVersion = "6.4.0-beta3",
5570+ name = "Qt6.4.0-beta4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework",
5571+ qtVersion = "6.4.0-beta4",
55725572 host = "macOS1015",
55735573 variant = {"-noFramework"},
55745574 opensslConf = "o3mx6",
@@ -5606,8 +5606,8 @@ conf.q6_4mx6nf = {
56065606 }
56075607
56085608 conf.q6_4mx6st = {
5609- name = "Qt6.4.0-beta3-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-static",
5610- qtVersion = "6.4.0-beta3",
5609+ name = "Qt6.4.0-beta4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-static",
5610+ qtVersion = "6.4.0-beta4",
56115611 host = "macOS1015",
56125612 variant = {"-static"},
56135613 opensslConf = "o3mx6",
@@ -5663,8 +5663,8 @@ conf.q6_4mx6st = {
56635663 }
56645664
56655665 conf.q6_4ma6 = {
5666- name = "Qt6.4.0-beta3-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
5667- qtVersion = "6.4.0-beta3",
5666+ name = "Qt6.4.0-beta4-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
5667+ qtVersion = "6.4.0-beta4",
56685668 host = "macOSM1",
56695669 opensslConf = "o3ma6",
56705670 useCMake = "Latest",
@@ -5701,8 +5701,8 @@ conf.q6_4ma6 = {
57015701 }
57025702
57035703 conf.q6_4ma6nf = {
5704- name = "Qt6.4.0-beta3-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-noFramework",
5705- qtVersion = "6.4.0-beta3",
5704+ name = "Qt6.4.0-beta4-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-noFramework",
5705+ qtVersion = "6.4.0-beta4",
57065706 host = "macOSM1",
57075707 variant = {"-noFramework"},
57085708 opensslConf = "o3ma6",
@@ -5740,8 +5740,8 @@ conf.q6_4ma6nf = {
57405740 }
57415741
57425742 conf.q6_4ma6st = {
5743- name = "Qt6.4.0-beta3-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-static",
5744- qtVersion = "6.4.0-beta3",
5743+ name = "Qt6.4.0-beta4-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-static",
5744+ qtVersion = "6.4.0-beta4",
57455745 host = "macOSM1",
57465746 variant = {"-static"},
57475747 opensslConf = "o3ma6",
@@ -5797,8 +5797,8 @@ conf.q6_4ma6st = {
57975797 }
57985798
57995799 conf.q6_4wx6g2_aa6n5 = {
5800- name = "Qt6.4.0-beta3-Android-arm64-Clang-NDKr25-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
5801- qtVersion = "6.4.0-beta3",
5800+ name = "Qt6.4.0-beta4-Android-arm64-Clang-NDKr25-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
5801+ qtVersion = "6.4.0-beta4",
58025802 host = "Win10",
58035803 target = "Android-27",
58045804 toolchain = "MinGW1210-64",
@@ -5836,8 +5836,8 @@ conf.q6_4wx6g2_aa6n5 = {
58365836 }
58375837
58385838 conf.q6_4wx6g2_ax6n5 = {
5839- name = "Qt6.4.0-beta3-Android-x86_64-Clang-NDKr25-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
5840- qtVersion = "6.4.0-beta3",
5839+ name = "Qt6.4.0-beta4-Android-x86_64-Clang-NDKr25-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
5840+ qtVersion = "6.4.0-beta4",
58415841 host = "Win10",
58425842 target = "Android-27",
58435843 toolchain = "MinGW1210-64",
@@ -5875,8 +5875,8 @@ conf.q6_4wx6g2_ax6n5 = {
58755875 }
58765876
58775877 conf.q6_4lx6_aa6n5 = {
5878- name = "Qt6.4.0-beta3-Android-arm64-Clang-NDKr25-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5879- qtVersion = "6.4.0-beta3",
5878+ name = "Qt6.4.0-beta4-Android-arm64-Clang-NDKr25-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5879+ qtVersion = "6.4.0-beta4",
58805880 host = "Rocky9",
58815881 target = "Android-27",
58825882 toolchainT = "Android-27-r25-arm64",
@@ -5912,8 +5912,8 @@ conf.q6_4lx6_aa6n5 = {
59125912 }
59135913
59145914 conf.q6_4lx6_ax6n5 = {
5915- name = "Qt6.4.0-beta3-Android-x86_64-Clang-NDKr25-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5916- qtVersion = "6.4.0-beta3",
5915+ name = "Qt6.4.0-beta4-Android-x86_64-Clang-NDKr25-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5916+ qtVersion = "6.4.0-beta4",
59175917 host = "Rocky9",
59185918 target = "Android-27",
59195919 toolchainT = "Android-27-r25-x86_64",
@@ -5949,8 +5949,8 @@ conf.q6_4lx6_ax6n5 = {
59495949 }
59505950
59515951 conf.q6_4mx6_aa6n5 = {
5952- name = "Qt6.4.0-beta3-Android-arm64-Clang-NDKr25-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
5953- qtVersion = "6.4.0-beta3",
5952+ name = "Qt6.4.0-beta4-Android-arm64-Clang-NDKr25-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
5953+ qtVersion = "6.4.0-beta4",
59545954 host = "macOS1015",
59555955 target = "Android-27",
59565956 toolchainT = "Android-27-r25-arm64",
@@ -5986,8 +5986,8 @@ conf.q6_4mx6_aa6n5 = {
59865986 }
59875987
59885988 conf.q6_4mx6_ax6n5 = {
5989- name = "Qt6.4.0-beta3-Android-x86_64-Clang-NDKr25-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
5990- qtVersion = "6.4.0-beta3",
5989+ name = "Qt6.4.0-beta4-Android-x86_64-Clang-NDKr25-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
5990+ qtVersion = "6.4.0-beta4",
59915991 host = "macOS1015",
59925992 target = "Android-27",
59935993 toolchainT = "Android-27-r25-x86_64",
@@ -6023,8 +6023,8 @@ conf.q6_4mx6_ax6n5 = {
60236023 }
60246024
60256025 conf.q6_4ma6_aa6n5 = {
6026- name = "Qt6.4.0-beta3-Android-arm64-Clang-NDKr25-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
6027- qtVersion = "6.4.0-beta3",
6026+ name = "Qt6.4.0-beta4-Android-arm64-Clang-NDKr25-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
6027+ qtVersion = "6.4.0-beta4",
60286028 host = "macOSM1",
60296029 target = "Android-27",
60306030 toolchainT = "Android-27-r25-arm64",
@@ -6060,8 +6060,8 @@ conf.q6_4ma6_aa6n5 = {
60606060 }
60616061
60626062 conf.q6_4ma6_ax6n5 = {
6063- name = "Qt6.4.0-beta3-Android-x86_64-Clang-NDKr25-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
6064- qtVersion = "6.4.0-beta3",
6063+ name = "Qt6.4.0-beta4-Android-x86_64-Clang-NDKr25-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
6064+ qtVersion = "6.4.0-beta4",
60656065 host = "macOSM1",
60666066 target = "Android-27",
60676067 toolchainT = "Android-27-r25-x86_64",
@@ -6098,8 +6098,8 @@ conf.q6_4ma6_ax6n5 = {
60986098
60996099 -- WebAssembly uses emcmake which don't need a toolchain file
61006100 conf.q6_4wx6g2_W = {
6101- name = "Qt6.4.0-beta3-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
6102- qtVersion = "6.4.0-beta3",
6101+ name = "Qt6.4.0-beta4-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&",
6102+ qtVersion = "6.4.0-beta4",
61036103 host = "Win10",
61046104 toolchain = "MinGW1210-64",
61056105 target = "WebAssembly",
@@ -6130,8 +6130,8 @@ conf.q6_4wx6g2_W = {
61306130 }
61316131
61326132 conf.q6_4lx6_W = {
6133- name = "Qt6.4.0-beta3-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
6134- qtVersion = "6.4.0-beta3",
6133+ name = "Qt6.4.0-beta4-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
6134+ qtVersion = "6.4.0-beta4",
61356135 host = "Rocky9",
61366136 target = "WebAssembly",
61376137 toolchainT = "emscripten-3.1.10",
@@ -6159,8 +6159,8 @@ conf.q6_4lx6_W = {
61596159 }
61606160
61616161 conf.q6_4mx6_W = {
6162- name = "Qt6.4.0-beta3-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
6163- qtVersion = "6.4.0-beta3",
6162+ name = "Qt6.4.0-beta4-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
6163+ qtVersion = "6.4.0-beta4",
61646164 host = "macOS1015",
61656165 target = "WebAssembly",
61666166 toolchainT = "emscripten-3.1.10",
@@ -6188,8 +6188,8 @@ conf.q6_4mx6_W = {
61886188 }
61896189
61906190 conf.q6_4ma6_W = {
6191- name = "Qt6.4.0-beta3-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
6192- qtVersion = "6.4.0-beta3",
6191+ name = "Qt6.4.0-beta4-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&",
6192+ qtVersion = "6.4.0-beta4",
61936193 host = "macOS1015",
61946194 target = "WebAssembly",
61956195 toolchainT = "emscripten-3.1.10",
@@ -6239,30 +6239,30 @@ local Qt6StaticConf = {
62396239 Win10 = {
62406240 ["6.2.4"] = "q6_2wx6m1st",
62416241 ["6.3.1"] = "q6_3wx6m1st",
6242- ["6.4.0-beta3"] = "q6_4wx6g2st",
6242+ ["6.4.0-beta4"] = "q6_4wx6g2st",
62436243 },
62446244 Win10MSVC2019 = {
62456245 ["6.2.4"] = "q6_2wx6v9st",
62466246 },
62476247 Win10MSVC2022 = {
62486248 ["6.3.1"] = "q6_3wx6v2st",
6249- ["6.4.0-beta3"] = "q6_4wx6v2st",
6249+ ["6.4.0-beta4"] = "q6_4wx6v2st",
62506250 },
62516251 CentOS8 = {
62526252 ["6.2.4"] = "q6_2lx6st",
62536253 ["6.3.1"] = "q6_3lx6st",
62546254 },
62556255 Rocky9 = {
6256- ["6.4.0-beta3"] = "q6_4lx6st",
6256+ ["6.4.0-beta4"] = "q6_4lx6st",
62576257 },
62586258 macOS1015 = {
62596259 ["6.2.4"] = "q6_2mx6st",
62606260 ["6.3.1"] = "q6_3mx6st",
6261- ["6.4.0-beta3"] = "q6_4mx6st",
6261+ ["6.4.0-beta4"] = "q6_4mx6st",
62626262 },
62636263 macOSM1 = {
62646264 ["6.3.1"] = "q6_3ma6st",
6265- ["6.4.0-beta3"] = "q6_4ma6st",
6265+ ["6.4.0-beta4"] = "q6_4ma6st",
62666266 },
62676267 }
62686268
@@ -6308,7 +6308,7 @@ local Win10SrcPackagePrefixWorkaroundVersions = {
63086308 "5.15.5-5",
63096309 "6.2.4",
63106310 "6.3.1",
6311- "6.4.0-beta3",
6311+ "6.4.0-beta4",
63126312 }
63136313
63146314 for name, value in pairs(conf) do