Revision | 9b14593f8bd3bc37bb2a9f59ed6b7bc8b6e13f5a (tree) |
---|---|
Zeit | 2024-04-02 22:06:06 |
Autor | Fs <Fsu0413@vip....> |
Commiter | Fs |
Qt 6.7.0
@@ -6866,8 +6866,8 @@ conf.q6_6mal_W = { | ||
6866 | 6866 | -------------------------------------------------------------------- |
6867 | 6867 | |
6868 | 6868 | conf.q6_7wx6v2 = { |
6869 | - name = "Qt6.7.0-rc2-Windows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
6870 | - qtVersion = "6.7.0-rc2", | |
6869 | + name = "Qt6.7.0-Windows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
6870 | + qtVersion = "6.7.0", | |
6871 | 6871 | host = "Win10", |
6872 | 6872 | toolchain = "MSVC2022-64", |
6873 | 6873 | opensslConf = "o3_0wx6v2", |
@@ -6907,8 +6907,8 @@ conf.q6_7wx6v2 = { | ||
6907 | 6907 | } |
6908 | 6908 | |
6909 | 6909 | conf.q6_7wa6v2 = { |
6910 | - name = "Qt6.7.0-rc2-Windows-arm64-VS2022-&HOSTTOOLVERSION&", | |
6911 | - qtVersion = "6.7.0-rc2", | |
6910 | + name = "Qt6.7.0-Windows-arm64-VS2022-&HOSTTOOLVERSION&", | |
6911 | + qtVersion = "6.7.0", | |
6912 | 6912 | host = "Win10Arm", |
6913 | 6913 | toolchain = "MSVC2022-arm64", |
6914 | 6914 | opensslConf = "o3_0wa6v2", |
@@ -6946,8 +6946,8 @@ conf.q6_7wa6v2 = { | ||
6946 | 6946 | } |
6947 | 6947 | |
6948 | 6948 | conf.q6_7wx6p3 = { |
6949 | - name = "Qt6.7.0-rc2-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt", | |
6950 | - qtVersion = "6.7.0-rc2", | |
6949 | + name = "Qt6.7.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt", | |
6950 | + qtVersion = "6.7.0", | |
6951 | 6951 | host = "Win10", |
6952 | 6952 | toolchain = "MinGW132u-64", |
6953 | 6953 | opensslConf = "o3_0wx6p3", |
@@ -6984,8 +6984,8 @@ conf.q6_7wx6p3 = { | ||
6984 | 6984 | } |
6985 | 6985 | |
6986 | 6986 | conf.q6_7wx6g3 = { |
6987 | - name = "Qt6.7.0-rc2-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
6988 | - qtVersion = "6.7.0-rc2", | |
6987 | + name = "Qt6.7.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
6988 | + qtVersion = "6.7.0", | |
6989 | 6989 | host = "Win10", |
6990 | 6990 | toolchain = "MinGW1320-64", |
6991 | 6991 | opensslConf = "o3_0wx6g3", |
@@ -7022,8 +7022,8 @@ conf.q6_7wx6g3 = { | ||
7022 | 7022 | } |
7023 | 7023 | |
7024 | 7024 | conf.q6_7wx6g3st = { |
7025 | - name = "Qt6.7.0-rc2-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt-static", | |
7026 | - qtVersion = "6.7.0-rc2", | |
7025 | + name = "Qt6.7.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt-static", | |
7026 | + qtVersion = "6.7.0", | |
7027 | 7027 | host = "Win10", |
7028 | 7028 | toolchain = "MinGW1320-64", |
7029 | 7029 | variant = {"-static(Lite)"}, |
@@ -7084,8 +7084,8 @@ conf.q6_7wx6g3st = { | ||
7084 | 7084 | } |
7085 | 7085 | |
7086 | 7086 | conf.q6_7wx6u8 = { |
7087 | - name = "Qt6.7.0-rc2-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt", | |
7088 | - qtVersion = "6.7.0-rc2", | |
7087 | + name = "Qt6.7.0-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt", | |
7088 | + qtVersion = "6.7.0", | |
7089 | 7089 | host = "Win10", |
7090 | 7090 | toolchain = "MinGWLLVM-ucrt18-64", |
7091 | 7091 | opensslConf = "o3_0wx6u8", |
@@ -7126,8 +7126,8 @@ conf.q6_7wx6u8 = { | ||
7126 | 7126 | } |
7127 | 7127 | |
7128 | 7128 | conf.q6_7wx6s8 = { |
7129 | - name = "Qt6.7.0-rc2-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt", | |
7130 | - qtVersion = "6.7.0-rc2", | |
7129 | + name = "Qt6.7.0-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt", | |
7130 | + qtVersion = "6.7.0", | |
7131 | 7131 | host = "Win10", |
7132 | 7132 | toolchain = "MinGWLLVM-msvcrt18-64", |
7133 | 7133 | opensslConf = "o3_0wx6s8", |
@@ -7168,8 +7168,8 @@ conf.q6_7wx6s8 = { | ||
7168 | 7168 | } |
7169 | 7169 | |
7170 | 7170 | conf.q6_7lx6st = { |
7171 | - name = "Qt6.7.0-rc2-Linux-x86_64-gcc&HOSTTOOLVERSION&-static", | |
7172 | - qtVersion = "6.7.0-rc2", | |
7171 | + name = "Qt6.7.0-Linux-x86_64-gcc&HOSTTOOLVERSION&-static", | |
7172 | + qtVersion = "6.7.0", | |
7173 | 7173 | host = "Rocky9", |
7174 | 7174 | variant = {"-static(Lite)"}, |
7175 | 7175 | useCMake = "Latest", |
@@ -7227,8 +7227,8 @@ conf.q6_7lx6st = { | ||
7227 | 7227 | } |
7228 | 7228 | |
7229 | 7229 | conf.q6_7mal = { |
7230 | - name = "Qt6.7.0-rc2-macOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
7231 | - qtVersion = "6.7.0-rc2", | |
7230 | + name = "Qt6.7.0-macOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
7231 | + qtVersion = "6.7.0", | |
7232 | 7232 | host = "macOSM1", |
7233 | 7233 | opensslConf = "o3_0mal", |
7234 | 7234 | mysqlConf = "m3_3mal", |
@@ -7275,8 +7275,8 @@ conf.q6_7mal = { | ||
7275 | 7275 | } |
7276 | 7276 | |
7277 | 7277 | conf.q6_7malnf = { |
7278 | - name = "Qt6.7.0-rc2-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework", | |
7279 | - qtVersion = "6.7.0-rc2", | |
7278 | + name = "Qt6.7.0-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework", | |
7279 | + qtVersion = "6.7.0", | |
7280 | 7280 | host = "macOSM1", |
7281 | 7281 | variant = {"-no-framework"}, |
7282 | 7282 | opensslConf = "o3_0mal", |
@@ -7324,8 +7324,8 @@ conf.q6_7malnf = { | ||
7324 | 7324 | } |
7325 | 7325 | |
7326 | 7326 | conf.q6_7malst = { |
7327 | - name = "Qt6.7.0-rc2-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static", | |
7328 | - qtVersion = "6.7.0-rc2", | |
7327 | + name = "Qt6.7.0-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static", | |
7328 | + qtVersion = "6.7.0", | |
7329 | 7329 | host = "macOSM1", |
7330 | 7330 | variant = {"-static(Lite)"}, |
7331 | 7331 | useCMake = "Latest", |
@@ -7384,8 +7384,8 @@ conf.q6_7malst = { | ||
7384 | 7384 | } |
7385 | 7385 | |
7386 | 7386 | conf.q6_7wx6g3_aa3nV26 = { |
7387 | - name = "Qt6.7.0-rc2-Android-arm-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
7388 | - qtVersion = "6.7.0-rc2", | |
7387 | + name = "Qt6.7.0-Android-arm-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
7388 | + qtVersion = "6.7.0", | |
7389 | 7389 | host = "Win10", |
7390 | 7390 | target = "Android-27", |
7391 | 7391 | toolchain = "MinGW1320-64", |
@@ -7424,8 +7424,8 @@ conf.q6_7wx6g3_aa3nV26 = { | ||
7424 | 7424 | } |
7425 | 7425 | |
7426 | 7426 | conf.q6_7wx6g3_aa6nV26 = { |
7427 | - name = "Qt6.7.0-rc2-Android-arm64-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
7428 | - qtVersion = "6.7.0-rc2", | |
7427 | + name = "Qt6.7.0-Android-arm64-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
7428 | + qtVersion = "6.7.0", | |
7429 | 7429 | host = "Win10", |
7430 | 7430 | target = "Android-27", |
7431 | 7431 | toolchain = "MinGW1320-64", |
@@ -7464,8 +7464,8 @@ conf.q6_7wx6g3_aa6nV26 = { | ||
7464 | 7464 | } |
7465 | 7465 | |
7466 | 7466 | conf.q6_7wx6g3_ax6nV26 = { |
7467 | - name = "Qt6.7.0-rc2-Android-x86_64-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
7468 | - qtVersion = "6.7.0-rc2", | |
7467 | + name = "Qt6.7.0-Android-x86_64-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
7468 | + qtVersion = "6.7.0", | |
7469 | 7469 | host = "Win10", |
7470 | 7470 | target = "Android-27", |
7471 | 7471 | toolchain = "MinGW1320-64", |
@@ -7504,8 +7504,8 @@ conf.q6_7wx6g3_ax6nV26 = { | ||
7504 | 7504 | } |
7505 | 7505 | |
7506 | 7506 | conf.q6_7lx6_aa3nV26 = { |
7507 | - name = "Qt6.7.0-rc2-Android-arm-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
7508 | - qtVersion = "6.7.0-rc2", | |
7507 | + name = "Qt6.7.0-Android-arm-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
7508 | + qtVersion = "6.7.0", | |
7509 | 7509 | host = "Rocky9", |
7510 | 7510 | target = "Android-27", |
7511 | 7511 | toolchainT = "Android-27-r26c-arm", |
@@ -7542,8 +7542,8 @@ conf.q6_7lx6_aa3nV26 = { | ||
7542 | 7542 | } |
7543 | 7543 | |
7544 | 7544 | conf.q6_7lx6_aa6nV26 = { |
7545 | - name = "Qt6.7.0-rc2-Android-arm64-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
7546 | - qtVersion = "6.7.0-rc2", | |
7545 | + name = "Qt6.7.0-Android-arm64-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
7546 | + qtVersion = "6.7.0", | |
7547 | 7547 | host = "Rocky9", |
7548 | 7548 | target = "Android-27", |
7549 | 7549 | toolchainT = "Android-27-r26c-arm64", |
@@ -7580,8 +7580,8 @@ conf.q6_7lx6_aa6nV26 = { | ||
7580 | 7580 | } |
7581 | 7581 | |
7582 | 7582 | conf.q6_7lx6_ax6nV26 = { |
7583 | - name = "Qt6.7.0-rc2-Android-x86_64-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
7584 | - qtVersion = "6.7.0-rc2", | |
7583 | + name = "Qt6.7.0-Android-x86_64-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
7584 | + qtVersion = "6.7.0", | |
7585 | 7585 | host = "Rocky9", |
7586 | 7586 | target = "Android-27", |
7587 | 7587 | toolchainT = "Android-27-r26c-x86_64", |
@@ -7618,8 +7618,8 @@ conf.q6_7lx6_ax6nV26 = { | ||
7618 | 7618 | } |
7619 | 7619 | |
7620 | 7620 | conf.q6_7mal_aa3nV26 = { |
7621 | - name = "Qt6.7.0-rc2-Android-arm-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
7622 | - qtVersion = "6.7.0-rc2", | |
7621 | + name = "Qt6.7.0-Android-arm-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
7622 | + qtVersion = "6.7.0", | |
7623 | 7623 | host = "macOSM1", |
7624 | 7624 | target = "Android-27", |
7625 | 7625 | toolchainT = "Android-27-r26c-arm", |
@@ -7656,8 +7656,8 @@ conf.q6_7mal_aa3nV26 = { | ||
7656 | 7656 | } |
7657 | 7657 | |
7658 | 7658 | conf.q6_7mal_aa6nV26 = { |
7659 | - name = "Qt6.7.0-rc2-Android-arm64-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
7660 | - qtVersion = "6.7.0-rc2", | |
7659 | + name = "Qt6.7.0-Android-arm64-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
7660 | + qtVersion = "6.7.0", | |
7661 | 7661 | host = "macOSM1", |
7662 | 7662 | target = "Android-27", |
7663 | 7663 | toolchainT = "Android-27-r26c-arm64", |
@@ -7694,8 +7694,8 @@ conf.q6_7mal_aa6nV26 = { | ||
7694 | 7694 | } |
7695 | 7695 | |
7696 | 7696 | conf.q6_7mal_ax6nV26 = { |
7697 | - name = "Qt6.7.0-rc2-Android-x86_64-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
7698 | - qtVersion = "6.7.0-rc2", | |
7697 | + name = "Qt6.7.0-Android-x86_64-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
7698 | + qtVersion = "6.7.0", | |
7699 | 7699 | host = "macOSM1", |
7700 | 7700 | target = "Android-27", |
7701 | 7701 | toolchainT = "Android-27-r26c-x86_64", |
@@ -7733,8 +7733,8 @@ conf.q6_7mal_ax6nV26 = { | ||
7733 | 7733 | |
7734 | 7734 | -- WebAssembly uses emcmake which don't need a toolchain file |
7735 | 7735 | conf.q6_7wx6g3_W = { |
7736 | - name = "Qt6.7.0-rc2-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
7737 | - qtVersion = "6.7.0-rc2", | |
7736 | + name = "Qt6.7.0-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
7737 | + qtVersion = "6.7.0", | |
7738 | 7738 | host = "Win10", |
7739 | 7739 | toolchain = "MinGW1320-64", |
7740 | 7740 | target = "WebAssembly", |
@@ -7764,8 +7764,8 @@ conf.q6_7wx6g3_W = { | ||
7764 | 7764 | } |
7765 | 7765 | |
7766 | 7766 | conf.q6_7lx6_W = { |
7767 | - name = "Qt6.7.0-rc2-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
7768 | - qtVersion = "6.7.0-rc2", | |
7767 | + name = "Qt6.7.0-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
7768 | + qtVersion = "6.7.0", | |
7769 | 7769 | host = "Rocky9", |
7770 | 7770 | target = "WebAssembly", |
7771 | 7771 | toolchainT = "emscripten-3.1.50", |
@@ -7794,8 +7794,8 @@ conf.q6_7lx6_W = { | ||
7794 | 7794 | } |
7795 | 7795 | |
7796 | 7796 | conf.q6_7mal_W = { |
7797 | - name = "Qt6.7.0-rc2-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
7798 | - qtVersion = "6.7.0-rc2", | |
7797 | + name = "Qt6.7.0-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
7798 | + qtVersion = "6.7.0", | |
7799 | 7799 | host = "macOSM1", |
7800 | 7800 | target = "WebAssembly", |
7801 | 7801 | toolchainT = "emscripten-3.1.50", |
@@ -7828,7 +7828,7 @@ local Qt6StaticConf = { | ||
7828 | 7828 | ["6.2.7"] = "q6_2wx6g1st", |
7829 | 7829 | ["6.5.3"] = "q6_5wx6g2st", |
7830 | 7830 | ["6.6.3"] = "q6_6wx6g2st", |
7831 | - ["6.7.0-rc2"] = "q6_7wx6g3st", | |
7831 | + ["6.7.0"] = "q6_7wx6g3st", | |
7832 | 7832 | }, |
7833 | 7833 | CentOS8 = { |
7834 | 7834 | ["6.2.7"] = "q6_2lx6st", |
@@ -7836,13 +7836,13 @@ local Qt6StaticConf = { | ||
7836 | 7836 | Rocky9 = { |
7837 | 7837 | ["6.5.3"] = "q6_5lx6st", |
7838 | 7838 | ["6.6.3"] = "q6_6lx6st", |
7839 | - ["6.7.0-rc2"] = "q6_7lx6st", | |
7839 | + ["6.7.0"] = "q6_7lx6st", | |
7840 | 7840 | }, |
7841 | 7841 | macOSM1 = { |
7842 | 7842 | ["6.2.7"] = "q6_2malst", |
7843 | 7843 | ["6.5.3"] = "q6_5malst", |
7844 | 7844 | ["6.6.3"] = "q6_6malst", |
7845 | - ["6.7.0-rc2"] = "q6_7malst", | |
7845 | + ["6.7.0"] = "q6_7malst", | |
7846 | 7846 | }, |
7847 | 7847 | } |
7848 | 7848 |
@@ -7889,7 +7889,7 @@ local Win10SrcPackagePrefixWorkaroundVersions = { | ||
7889 | 7889 | "6.2.7", |
7890 | 7890 | "6.5.3", |
7891 | 7891 | "6.6.3", |
7892 | - "6.7.0-rc2", | |
7892 | + "6.7.0", | |
7893 | 7893 | } |
7894 | 7894 | |
7895 | 7895 | for name, value in pairs(conf) do |