Skip to content

Commit eae6065

Browse files
author
Tobias Hieta
committed
Import Qt 5.14.2
1 parent 6b502d4 commit eae6065

File tree

5,250 files changed

+39828
-15558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,250 files changed

+39828
-15558
lines changed

.gitmodules

+43-43
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
[submodule "qtbase"]
22
path = qtbase
33
url = ../qtbase.git
4-
branch = 5.14.1
4+
branch = 5.14.2
55
status = essential
66
[submodule "qtsvg"]
77
depends = qtbase
88
path = qtsvg
99
url = ../qtsvg.git
10-
branch = 5.14.1
10+
branch = 5.14.2
1111
status = addon
1212
[submodule "qtdeclarative"]
1313
depends = qtbase
1414
recommends = qtsvg
1515
path = qtdeclarative
1616
url = ../qtdeclarative.git
17-
branch = 5.14.1
17+
branch = 5.14.2
1818
status = essential
1919
[submodule "qtactiveqt"]
2020
depends = qtbase
2121
path = qtactiveqt
2222
url = ../qtactiveqt.git
23-
branch = 5.14.1
23+
branch = 5.14.2
2424
status = addon
2525
[submodule "qtscript"]
2626
depends = qtbase
2727
recommends = qttools
2828
path = qtscript
2929
url = ../qtscript.git
30-
branch = 5.14.1
30+
branch = 5.14.2
3131
status = deprecated
3232
[submodule "qtmultimedia"]
3333
depends = qtbase
3434
recommends = qtdeclarative
3535
path = qtmultimedia
3636
url = ../qtmultimedia.git
37-
branch = 5.14.1
37+
branch = 5.14.2
3838
status = essential
3939
[submodule "qttools"]
4040
depends = qtbase
4141
recommends = qtdeclarative qtactiveqt
4242
path = qttools
4343
url = ../qttools.git
44-
branch = 5.14.1
44+
branch = 5.14.2
4545
status = essential
4646
[submodule "qtxmlpatterns"]
4747
depends = qtbase
4848
recommends = qtdeclarative
4949
path = qtxmlpatterns
5050
url = ../qtxmlpatterns.git
51-
branch = 5.14.1
51+
branch = 5.14.2
5252
status = deprecated
5353
[submodule "qttranslations"]
5454
depends = qttools
5555
path = qttranslations
5656
url = ../qttranslations.git
57-
branch = 5.14.1
57+
branch = 5.14.2
5858
status = essential
5959
priority = 30
6060
[submodule "qtdoc"]
6161
depends = qtdeclarative qttools
6262
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
6363
path = qtdoc
6464
url = ../qtdoc.git
65-
branch = 5.14.1
65+
branch = 5.14.2
6666
status = essential
6767
priority = 40
6868
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
8383
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
8484
path = qtlocation
8585
url = ../qtlocation.git
86-
branch = 5.14.1
86+
branch = 5.14.2
8787
status = addon
8888
[submodule "qtsensors"]
8989
depends = qtbase
9090
recommends = qtdeclarative
9191
path = qtsensors
9292
url = ../qtsensors.git
93-
branch = 5.14.1
93+
branch = 5.14.2
9494
status = addon
9595
[submodule "qtsystems"]
9696
depends = qtbase
@@ -123,99 +123,99 @@
123123
recommends = qtdeclarative qtandroidextras
124124
path = qtconnectivity
125125
url = ../qtconnectivity.git
126-
branch = 5.14.1
126+
branch = 5.14.2
127127
status = addon
128128
[submodule "qtwayland"]
129129
depends = qtbase
130130
recommends = qtdeclarative
131131
path = qtwayland
132132
url = ../qtwayland.git
133-
branch = 5.14.1
133+
branch = 5.14.2
134134
status = addon
135135
[submodule "qt3d"]
136136
depends = qtbase
137137
recommends = qtdeclarative qtimageformats qtgamepad
138138
path = qt3d
139139
url = ../qt3d.git
140-
branch = 5.14.1
140+
branch = 5.14.2
141141
status = addon
142142
[submodule "qtimageformats"]
143143
depends = qtbase
144144
path = qtimageformats
145145
url = ../qtimageformats.git
146-
branch = 5.14.1
146+
branch = 5.14.2
147147
status = addon
148148
[submodule "qtgraphicaleffects"]
149149
depends = qtdeclarative
150150
path = qtgraphicaleffects
151151
url = ../qtgraphicaleffects.git
152-
branch = 5.14.1
153-
status = addon
152+
branch = 5.14.2
153+
status = essential
154154
[submodule "qtquickcontrols"]
155155
depends = qtdeclarative
156156
recommends = qtgraphicaleffects
157157
path = qtquickcontrols
158158
url = ../qtquickcontrols.git
159-
branch = 5.14.1
159+
branch = 5.14.2
160160
status = addon
161161
[submodule "qtserialbus"]
162162
depends = qtbase
163163
recommends = qtserialport
164164
path = qtserialbus
165165
url = ../qtserialbus.git
166-
branch = 5.14.1
166+
branch = 5.14.2
167167
status = addon
168168
[submodule "qtserialport"]
169169
depends = qtbase
170170
path = qtserialport
171171
url = ../qtserialport.git
172-
branch = 5.14.1
172+
branch = 5.14.2
173173
status = addon
174174
[submodule "qtx11extras"]
175175
depends = qtbase
176176
path = qtx11extras
177177
url = ../qtx11extras.git
178-
branch = 5.14.1
178+
branch = 5.14.2
179179
status = addon
180180
[submodule "qtmacextras"]
181181
depends = qtbase
182182
path = qtmacextras
183183
url = ../qtmacextras.git
184-
branch = 5.14.1
184+
branch = 5.14.2
185185
status = addon
186186
[submodule "qtwinextras"]
187187
depends = qtbase
188188
recommends = qtdeclarative qtmultimedia
189189
path = qtwinextras
190190
url = ../qtwinextras.git
191-
branch = 5.14.1
191+
branch = 5.14.2
192192
status = addon
193193
[submodule "qtandroidextras"]
194194
depends = qtbase
195195
path = qtandroidextras
196196
url = ../qtandroidextras.git
197-
branch = 5.14.1
197+
branch = 5.14.2
198198
status = addon
199199
[submodule "qtwebsockets"]
200200
depends = qtbase
201201
recommends = qtdeclarative
202202
path = qtwebsockets
203203
url = ../qtwebsockets.git
204-
branch = 5.14.1
204+
branch = 5.14.2
205205
status = addon
206206
[submodule "qtwebchannel"]
207207
depends = qtbase
208208
recommends = qtdeclarative qtwebsockets
209209
path = qtwebchannel
210210
url = ../qtwebchannel.git
211-
branch = 5.14.1
211+
branch = 5.14.2
212212
status = addon
213213
[submodule "qtwebengine"]
214214
depends = qtdeclarative
215215
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
216216
path = qtwebengine
217217
url = ../qtwebengine.git
218-
branch = 5.14.1
218+
branch = 5.14.2
219219
status = addon
220220
priority = 10
221221
[submodule "qtcanvas3d"]
@@ -229,98 +229,98 @@
229229
recommends = qtwebengine
230230
path = qtwebview
231231
url = ../qtwebview.git
232-
branch = 5.14.1
232+
branch = 5.14.2
233233
status = addon
234234
[submodule "qtquickcontrols2"]
235235
depends = qtgraphicaleffects
236236
recommends = qtimageformats
237237
path = qtquickcontrols2
238238
url = ../qtquickcontrols2.git
239-
branch = 5.14.1
239+
branch = 5.14.2
240240
status = essential
241241
[submodule "qtpurchasing"]
242242
depends = qtbase
243243
recommends = qtdeclarative qtandroidextras
244244
path = qtpurchasing
245245
url = ../qtpurchasing.git
246-
branch = 5.14.1
246+
branch = 5.14.2
247247
status = addon
248248
[submodule "qtcharts"]
249249
depends = qtbase
250250
recommends = qtdeclarative qtmultimedia
251251
path = qtcharts
252252
url = ../qtcharts.git
253-
branch = 5.14.1
253+
branch = 5.14.2
254254
status = addon
255255
[submodule "qtdatavis3d"]
256256
depends = qtbase
257257
recommends = qtdeclarative qtmultimedia
258258
path = qtdatavis3d
259259
url = ../qtdatavis3d.git
260-
branch = 5.14.1
260+
branch = 5.14.2
261261
status = addon
262262
[submodule "qtvirtualkeyboard"]
263263
depends = qtbase qtdeclarative qtsvg
264264
recommends = qtmultimedia qtquickcontrols
265265
path = qtvirtualkeyboard
266266
url = ../qtvirtualkeyboard.git
267-
branch = 5.14.1
267+
branch = 5.14.2
268268
status = addon
269269
[submodule "qtgamepad"]
270270
depends = qtbase
271271
recommends = qtdeclarative
272272
path = qtgamepad
273273
url = ../qtgamepad.git
274-
branch = 5.14.1
274+
branch = 5.14.2
275275
status = addon
276276
[submodule "qtscxml"]
277277
depends = qtbase qtdeclarative
278278
path = qtscxml
279279
url = ../qtscxml.git
280-
branch = 5.14.1
280+
branch = 5.14.2
281281
status = addon
282282
[submodule "qtspeech"]
283283
depends = qtbase
284284
recommends = qtdeclarative qtmultimedia
285285
path = qtspeech
286286
url = ../qtspeech.git
287-
branch = 5.14.1
287+
branch = 5.14.2
288288
status = addon
289289
[submodule "qtnetworkauth"]
290290
depends = qtbase
291291
path = qtnetworkauth
292292
url = ../qtnetworkauth.git
293-
branch = 5.14.1
293+
branch = 5.14.2
294294
status = addon
295295
[submodule "qtremoteobjects"]
296296
depends = qtbase
297297
recommends = qtdeclarative
298298
path = qtremoteobjects
299299
url = ../qtremoteobjects.git
300-
branch = 5.14.1
300+
branch = 5.14.2
301301
status = addon
302302
[submodule "qtwebglplugin"]
303303
depends = qtbase qtwebsockets
304304
recommends = qtdeclarative
305305
path = qtwebglplugin
306306
url = ../qtwebglplugin.git
307-
branch = 5.14.1
307+
branch = 5.14.2
308308
status = addon
309309
[submodule "qtlottie"]
310310
depends = qtbase qtdeclarative
311311
path = qtlottie
312312
url = ../qtlottie.git
313-
branch = 5.14.1
313+
branch = 5.14.2
314314
status = preview
315315
[submodule "qtquicktimeline"]
316316
depends = qtbase qtdeclarative
317317
path = qtquicktimeline
318318
url = ../qtquicktimeline
319-
branch = 5.14.1
319+
branch = 5.14.2
320320
status = preview
321321
[submodule "qtquick3d"]
322322
depends = qtbase qtdeclarative
323323
path = qtquick3d
324324
url = ../qtquick3d.git
325-
branch = 5.14.1
325+
branch = 5.14.2
326326
status = preview

.tag

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2e7ba38d18768d2a926bf78bf253fec71ba5fe15

coin/platform_configs/default.yaml

+7-8
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@ Configurations:
55
Template: 'qtci-windows-10-x86_64-16'
66
Compiler: 'MSVC2015'
77
Features: ['DisableTests']
8-
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
8+
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
99
-
1010
Template: 'qtci-windows-7-x86-3'
1111
Compiler: 'Mingw73'
12-
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
12+
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
1313
-
1414
Template: 'qtci-windows-10-x86_64-16'
1515
Target arch: 'x86'
1616
Compiler: 'MSVC2017'
1717
Features: ['Packaging']
18-
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%'
18+
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
1919
-
2020
Template: 'qtci-windows-10-x86_64-16'
2121
Target arch: 'x86'
2222
Compiler: 'MSVC2019'
2323
Features: ['DisableTests']
24-
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%'
24+
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
2525
-
2626
Template: 'qtci-windows-10-x86_64-16'
2727
Compiler: 'MSVC2015'
2828
Features: ['Packaging', 'DisableTests']
29-
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
29+
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
3030
-
3131
Template: 'qtci-windows-10-x86_64-16'
3232
Target os: 'WinRT_10'
@@ -45,12 +45,12 @@ Configurations:
4545
Template: 'qtci-windows-10-x86_64-16'
4646
Compiler: 'MSVC2017'
4747
Features: ['Packaging']
48-
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
48+
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
4949
-
5050
Template: 'qtci-windows-10-x86_64-16'
5151
Compiler: 'MSVC2019'
5252
Features: ['DisableTests']
53-
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
53+
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
5454
-
5555
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
5656
Compiler: 'GCC'
@@ -103,7 +103,6 @@ Configurations:
103103
-
104104
Template: 'qtci-macos-10.14-x86_64'
105105
Compiler: 'Clang'
106-
Features: ['DisableTests']
107106
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
108107
-
109108
Template: 'qtci-macos-10.14-x86_64'

0 commit comments

Comments
 (0)