OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

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

Revision494268e42033413ce24eb6954dc3ea528cc9d706 (tree)
Time2020-12-14 09:16:11
AuthorFs <Fsu0413@user...>
CommiterFs

Log Message

update for Qt 5.15.2

Change Summary

Incremental Difference

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -5,7 +5,7 @@ local conf = {}
55 abbrs:
66 OpenSSL Versions:
77 o0: OpenSSL 1.0.2u (Reached EOL at 2019/12/31)
8- o1: OpenSSL 1.1.1h
8+ o1: OpenSSL 1.1.1i
99 o3: OpenSSL 3.0.0 (Not released yet)
1010 Most of OpenSSL builds has its makefiles changed for our use. No "m" will be prefixed.
1111
@@ -41,20 +41,20 @@ abbrs:
4141
4242 --------------------------------------------------------------------
4343
44--- OpenSSL 1.1.1h
44+-- OpenSSL 1.1.1i
4545
4646
4747 conf.o1wx3v5 = {
48- name = "OpenSSL1.1.1h-Windows-x86-VS2015",
49- opensslVersion = "1.1.1h",
48+ name = "OpenSSL1.1.1i-Windows-x86-VS2015",
49+ opensslVersion = "1.1.1i",
5050 host = "Win8",
5151 toolchain = "MSVC2015-32",
5252 libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
5353 }
5454
5555 conf.o1wx3v5st = {
56- name = "OpenSSL1.1.1h-Windows-x86-VS2015-static",
57- opensslVersion = "1.1.1h",
56+ name = "OpenSSL1.1.1i-Windows-x86-VS2015-static",
57+ opensslVersion = "1.1.1i",
5858 host = "Win8",
5959 toolchain = "MSVC2015-32",
6060 variant = {"-static"},
@@ -62,16 +62,16 @@ conf.o1wx3v5st = {
6262 }
6363
6464 conf.o1wx6v5 = {
65- name = "OpenSSL1.1.1h-Windows-x86_64-VS2015",
66- opensslVersion = "1.1.1h",
65+ name = "OpenSSL1.1.1i-Windows-x86_64-VS2015",
66+ opensslVersion = "1.1.1i",
6767 host = "Win8",
6868 toolchain = "MSVC2015-64",
6969 libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
7070 }
7171
7272 conf.o1wx3m7 = {
73- name = "OpenSSL1.1.1h-Windows-x86-MinGW-GCC7.3.0",
74- opensslVersion = "1.1.1h",
73+ name = "OpenSSL1.1.1i-Windows-x86-MinGW-GCC7.3.0",
74+ opensslVersion = "1.1.1i",
7575 host = "Win8SH",
7676 toolchain = "MinGW730-32",
7777 libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
@@ -79,8 +79,8 @@ conf.o1wx3m7 = {
7979 }
8080
8181 conf.o1wx6m7 = {
82- name = "OpenSSL1.1.1h-Windows-x86_64-MinGW-GCC7.3.0",
83- opensslVersion = "1.1.1h",
82+ name = "OpenSSL1.1.1i-Windows-x86_64-MinGW-GCC7.3.0",
83+ opensslVersion = "1.1.1i",
8484 host = "Win8SH",
8585 toolchain = "MinGW730-64",
8686 libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
@@ -88,16 +88,16 @@ conf.o1wx6m7 = {
8888 }
8989
9090 conf.o1wx3v7 = {
91- name = "OpenSSL1.1.1h-Windows-x86-VS2017-&MSVCVER&",
92- opensslVersion = "1.1.1h",
91+ name = "OpenSSL1.1.1i-Windows-x86-VS2017-&MSVCVER&",
92+ opensslVersion = "1.1.1i",
9393 host = "Win10",
9494 toolchain = "MSVC2017-32",
9595 libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
9696 }
9797
9898 conf.o1wx3v7st = {
99- name = "OpenSSL1.1.1h-Windows-x86-VS2017-&MSVCVER&-static",
100- opensslVersion = "1.1.1h",
99+ name = "OpenSSL1.1.1i-Windows-x86-VS2017-&MSVCVER&-static",
100+ opensslVersion = "1.1.1i",
101101 host = "Win10",
102102 toolchain = "MSVC2017-32",
103103 variant = {"-static"},
@@ -105,16 +105,16 @@ conf.o1wx3v7st = {
105105 }
106106
107107 conf.o1wx6v7 = {
108- name = "OpenSSL1.1.1h-Windows-x86_64-VS2017-&MSVCVER&",
109- opensslVersion = "1.1.1h",
108+ name = "OpenSSL1.1.1i-Windows-x86_64-VS2017-&MSVCVER&",
109+ opensslVersion = "1.1.1i",
110110 host = "Win10",
111111 toolchain = "MSVC2017-64",
112112 libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
113113 }
114114
115115 conf.o1wx6v7st = {
116- name = "OpenSSL1.1.1h-Windows-x86_64-VS2017-&MSVCVER&-static",
117- opensslVersion = "1.1.1h",
116+ name = "OpenSSL1.1.1i-Windows-x86_64-VS2017-&MSVCVER&-static",
117+ opensslVersion = "1.1.1i",
118118 host = "Win10",
119119 toolchain = "MSVC2017-64",
120120 variant = {"-static"},
@@ -122,8 +122,8 @@ conf.o1wx6v7st = {
122122 }
123123
124124 conf.o1wa6v7 = {
125- name = "OpenSSL1.1.1h-Windows-arm64-VS2017-&MSVCVER&",
126- opensslVersion = "1.1.1h",
125+ name = "OpenSSL1.1.1i-Windows-arm64-VS2017-&MSVCVER&",
126+ opensslVersion = "1.1.1i",
127127 host = "Win10",
128128 target = "Win10Arm",
129129 toolchain = "MSVC2017-64", -- only a placeholder here, in fact it only uses "toolchainT"
@@ -132,24 +132,24 @@ conf.o1wa6v7 = {
132132 }
133133
134134 conf.o1wx3v9 = {
135- name = "OpenSSL1.1.1h-Windows-x86-VS2019-&MSVCVER&",
136- opensslVersion = "1.1.1h",
135+ name = "OpenSSL1.1.1i-Windows-x86-VS2019-&MSVCVER&",
136+ opensslVersion = "1.1.1i",
137137 host = "Win10",
138138 toolchain = "MSVC2019-32",
139139 libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" },
140140 }
141141
142142 conf.o1wx6v9 = {
143- name = "OpenSSL1.1.1h-Windows-x86_64-VS2019-&MSVCVER&",
144- opensslVersion = "1.1.1h",
143+ name = "OpenSSL1.1.1i-Windows-x86_64-VS2019-&MSVCVER&",
144+ opensslVersion = "1.1.1i",
145145 host = "Win10",
146146 toolchain = "MSVC2019-64",
147147 libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" },
148148 }
149149
150150 conf.o1aa3nl = {
151- name = "OpenSSL1.1.1h-AndroidAPI21-arm",
152- opensslVersion = "1.1.1h",
151+ name = "OpenSSL1.1.1i-AndroidAPI21-arm",
152+ opensslVersion = "1.1.1i",
153153 host = "CentOS8",
154154 target = "Android-21",
155155 toolchainT = "Android-21-r21d-arm",
@@ -157,8 +157,8 @@ conf.o1aa3nl = {
157157 }
158158
159159 conf.o1aa6nl = {
160- name = "OpenSSL1.1.1h-AndroidAPI21-arm64",
161- opensslVersion = "1.1.1h",
160+ name = "OpenSSL1.1.1i-AndroidAPI21-arm64",
161+ opensslVersion = "1.1.1i",
162162 host = "CentOS8",
163163 target = "Android-21",
164164 toolchainT = "Android-21-r21d-arm64",
@@ -166,8 +166,8 @@ conf.o1aa6nl = {
166166 }
167167
168168 conf.o1ax3nl = {
169- name = "OpenSSL1.1.1h-AndroidAPI21-x86",
170- opensslVersion = "1.1.1h",
169+ name = "OpenSSL1.1.1i-AndroidAPI21-x86",
170+ opensslVersion = "1.1.1i",
171171 host = "CentOS8",
172172 target = "Android-21",
173173 toolchainT = "Android-21-r21d-x86",
@@ -175,8 +175,8 @@ conf.o1ax3nl = {
175175 }
176176
177177 conf.o1ax6nl = {
178- name = "OpenSSL1.1.1h-AndroidAPI21-x86_64",
179- opensslVersion = "1.1.1h",
178+ name = "OpenSSL1.1.1i-AndroidAPI21-x86_64",
179+ opensslVersion = "1.1.1i",
180180 host = "CentOS8",
181181 target = "Android-21",
182182 toolchainT = "Android-21-r21d-x86_64",
@@ -184,8 +184,8 @@ conf.o1ax6nl = {
184184 }
185185
186186 conf.o1aalnl = {
187- name = "OpenSSL1.1.1h-AndroidAPI21-ALL",
188- opensslVersion = "1.1.1h",
187+ name = "OpenSSL1.1.1i-AndroidAPI21-ALL",
188+ opensslVersion = "1.1.1i",
189189 host = "CentOS8",
190190 target = "Android-21",
191191 toolchainT = "Android-21-r21d-all",
@@ -195,8 +195,8 @@ conf.o1aalnl = {
195195 --------------------------------------------------------------------
196196
197197 local MsvcVer = {
198- ["MSVC2017"] = "15.9.29",
199- ["MSVC2019"] = "16.8.2",
198+ ["MSVC2017"] = "15.9.30",
199+ ["MSVC2019"] = "16.8.3",
200200 }
201201
202202 for name, value in pairs(conf) do
--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -3248,7 +3248,7 @@ local versionMo = {
32483248 }
32493249
32503250 local OpensslVersion = {
3251- ["default"] = "1.1.1h"
3251+ ["default"] = "1.1.1i"
32523252 }
32533253
32543254 setmetatable(OpensslVersion, versionMo)
@@ -3267,8 +3267,8 @@ local QQtPatcherVersion = {
32673267 setmetatable(QQtPatcherVersion, versionMo)
32683268
32693269 local MsvcVer = {
3270- ["MSVC2017"] = "15.9.29",
3271- ["MSVC2019"] = "16.8.2",
3270+ ["MSVC2017"] = "15.9.30",
3271+ ["MSVC2019"] = "16.8.3",
32723272 }
32733273
32743274 local AppleClangVersion = {