lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,657 Commits 118 Branches 270 Tags
efd58ecf3c320727060ab6eb0bfa616754aa6f54
Commit Graph

4657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heikki Halmet
efd58ecf3c Provisioning: Temporary fix for installing Conan packages in Windows 
Task-number: QTQAINFRA-4443
Change-Id: Iba4b240edaf4a3ec8732ddbe1ae4ac5c1166b676
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 99a81d0c6c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-05-17 04:48:20 +00:00
Qt Submodule Update Bot
032d5386b7 Update submodules on '6.1' in qt/qt5 
Change-Id: Ic1bbf9be97d538cf9d88fc34d1b88142713de7f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-13 22:17:52 +03:00
Qt Submodule Update Bot
d7137a10e6 Update submodules on '6.1' in qt/qt5 
Change-Id: Ib7307071e10f37b3cf094033b2ea95fc3999dc01
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-13 09:38:59 +03:00
Qt Submodule Update Bot
cb760724a0 Update submodules on '6.1' in qt/qt5 
Change-Id: I3365c9d55dc718bbbd7871e37ee649985b7fb470
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-13 02:18:22 +03:00
Qt Submodule Update Bot
72305c6c0a Update submodules on '6.1' in qt/qt5 
Change-Id: Iaac20c6249e4a00b502e5c5425fe0511168d1989
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-12 05:30:46 +03:00
Qt Submodule Update Bot
9eca61b3fe Update submodules on '6.1' in qt/qt5 
Change-Id: I6de91b63d2214470ca45c6a1fce0fc7cbd8af927
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-12 01:02:46 +03:00
Qt Submodule Update Bot
913ac896f4 Update submodules on '6.1' in qt/qt5 
Change-Id: If60312b5c4fb6182631f3d8664cbaefc3fd74085
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-11 20:16:11 +03:00
Qt Submodule Update Bot
985e702164 Update submodules on '6.1' in qt/qt5 
Change-Id: I9b70d0a06887f24b3d42d8662fdb2bcddfda731a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-11 15:04:30 +03:00
Qt Submodule Update Bot
30423ffe9b Update submodules on '6.1' in qt/qt5 
Change-Id: I033c9435eece1c072d02d96baeb6e29695f66f19
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-11 10:50:40 +03:00
Qt Submodule Update Bot
75dee4f5fa Update submodules on '6.1' in qt/qt5 
Change-Id: Ide93708ae5d95f77df85a130b5de546b2d46c1fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-07 07:09:48 +03:00
Qt Submodule Update Bot
36ea89b7e3 Update submodules on '6.1' in qt/qt5 
Change-Id: I974aa7d1bd44204056b11695fe01ec92cfd67932
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-06 20:26:36 +03:00
Qt Submodule Update Bot
a89329f6ad Update submodules on '6.1' in qt/qt5 
Change-Id: Ie75121f5d762ba51e0fead50f20d0f80b2a7e9fb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-06 14:22:06 +03:00
Dan Ackers
f4d76ee88b Add static platform targets for qdb 
Task-number: QTBUG-90951
Change-Id: I9175141d0676526f7139587aeb9c81db15e42f5b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2021-05-06 12:26:32 +03:00
Qt Submodule Update Bot
b562b6b377 Update submodules on '6.1' in qt/qt5 
Change-Id: Ief0000cd5ceba68dab83d3aac15ebb0e51de6891
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-06 09:38:30 +03:00
Alexandru Croitor
7729149c97 Build minimal subset of tests in desktop static builds 
New cmake_platforms_static_tests.yaml file will be included in repos
that support building and running a minimal subset of tests built
against a static Qt.

Currently it's limited to qtbase.

Added macOS, Linux-SLES and Windows static configs.

Skipped specifying the PostgreSQL lib path for Windows and macOS because
the plugin gets automatically linked into tst_moc, but the test build
phase doesn't actually call find_package for PostgreSQL and the build
system generation fails.

Similary skipped specifying the openssl lib location for macOS,
because the module_includes cmake auto test fails to find the
WrapOpenSSLHeaders package.

Explicitly tag iOS static config with DisableTests. The instructions
already skipped building tests for iOS, but it's better to be explicit
and update the instructions not to do that anymore.

Task-number: QTBUG-87580
Change-Id: I0d38a0ad055c92646609202691aeb8db29689f5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit bead5e8720)
 2021-05-05 10:48:03 +02:00
Qt Submodule Update Bot
ad5af7931a Update submodules on '6.1' in qt/qt5 
Change-Id: I622cd24eed0b4e0c3728bf2b97ba5e9661d0728c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-05 07:07:02 +03:00
Qt Submodule Update Bot
2d81ba0ebe Update submodules on '6.1' in qt/qt5 
Change-Id: I0e971689370fbe221d58d3e9e575c26e3a627829
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-05 02:15:40 +03:00
Qt Submodule Update Bot
08d88f7581 Update submodules on '6.1' in qt/qt5 
Change-Id: I0ecfb22c28cb5d473b8bad465ef59e7034ab740c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-04 14:14:45 +03:00
Qt Submodule Update Bot
b9c174f4b0 Update submodules on '6.1' in qt/qt5 
Change-Id: Ib678fa9b7971f10d00e5c014d1f435577e2b0079
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-04 06:45:16 +03:00
Heikki Halmet
0cf6dd91b0 Remove InsignificantTests flag from macOS 11 
Change-Id: I3bc970226adaed9d8808da40a65abfacfcec809e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-05-03 08:58:18 +03:00
Qt Submodule Update Bot
d16b82370f Update submodules on '6.1' in qt/qt5 
Change-Id: Id3096c7c4815f01050098ea47d3079638f69872d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-01 05:24:40 +03:00
Qt Submodule Update Bot
f59659690e Update submodules on '6.1' in qt/qt5 
Change-Id: Ib40f765966f55c4190ae9db248631715b0c1fffa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-01 00:25:04 +03:00
Qt Submodule Update Bot
8a134c658e Update submodules on '6.1' in qt/qt5 
Change-Id: Ieea2dcf6f33c49e2b3f8095174ab376712365cdf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-30 18:55:44 +03:00
Qt Submodule Update Bot
9b3d0e36ec Update submodules on '6.1' in qt/qt5 
Change-Id: Ib201bdaa6bc7e4f069dee438480ddb2fe0be8451
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-29 10:18:38 +03:00
Heikki Halmet
9854f48e15 Provisioning: Upgrade python 3.6 version to 3.6.2 
typing.NoReturn is not included in python 3.6.1 version. We need at
least 3.6.2 version

Task-number: QTQAINFRA-4433
Change-Id: I040e72e253852c7789d4f9e781d18e6b9a431a50
Reviewed-by: Dan Ackers <dan.ackers@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 6ae5052d57)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-28 17:39:50 +00:00
Tor Arne Vestbø
031031cd2b Set up region and language settings on macOS to match United States 
The tst_qlocale::macDefaultLocale() test was failing on macOS 11 because
the VM images had been set up with Finland as the region, resulting in
a different number separator than what the test expected.

Fixes: QTBUG-90696
Change-Id: Ia2f68adc1401f21721d1786c5279aa0918a311a8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 4ad4befe4e)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-04-28 06:20:37 +00:00
Heikki Halmet
e1c1229e43 Remove InsignificantTests flag from macOS 10.15 
Change-Id: Ie713948cdcb8adebd7cb28ec02f76a2d38ce4db5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-04-28 09:20:34 +03:00
Qt Submodule Update Bot
cace763898 Update submodules on '6.1' in qt/qt5 
Change-Id: Ifba782d9ad57cc1636f9a89db381d1efda5463c3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-28 07:43:41 +03:00
Qt Submodule Update Bot
69a1f95302 Update submodules on '6.1' in qt/qt5 
Change-Id: I4b01296ef73af1d0bd88c5a3627b7f206380e276
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-28 02:48:39 +03:00
Qt Submodule Update Bot
a3193226c2 Update submodules on '6.1' in qt/qt5 
Change-Id: Ieb37f4016c9e8e00efde399be5e415894a709604
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-27 20:12:51 +03:00
Heikki Halmet
ea8c9b274f Provisioning: Fix nodejs installation 
Task-number: QTBUG-93178
Change-Id: I27f4b1aa6f382cb6c9cc97f960fe1d0b81e47fbd
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 9e0334389b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-27 13:18:29 +00:00
Qt Submodule Update Bot
46d6f0c5f8 Update submodules on '6.1' in qt/qt5 
Change-Id: I91a6a91e5c1c4ef7b5a55da4bb612e64a12d1d82
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-27 13:22:45 +03:00
Qt Submodule Update Bot
30cba8d018 Update submodules on '6.1' in qt/qt5 
Change-Id: I8c530b4be1c24fc3ad197bbf7a880c727b0ef7e2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-27 07:30:25 +03:00
Qt Submodule Update Bot
23124be6d2 Update submodules on '6.1' in qt/qt5 
Change-Id: I09a61d81539a99cf2930837ae7eb08c35c2e4950
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-27 02:19:02 +03:00
Qt Submodule Update Bot
722111a304 Update submodules on '6.1' in qt/qt5 
Change-Id: Icdfb3c483959c28c6495cff83dd2372b1a3fef48
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-26 20:32:30 +03:00
Heikki Halmet
a08809f1ee Provisioning: Fix gcc toolset source path 
Change-Id: I4e81894648c25ce629914bc4bd9ffa65681ad004
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 2d47450e69)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-26 14:12:57 +00:00
Qt Submodule Update Bot
d3126192dd Update submodules on '6.1' in qt/qt5 
Change-Id: I9cad6ec24512edcc8fd709ea2c80680f1e3a5992
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-26 15:52:57 +03:00
Qt Submodule Update Bot
bafa84ea1d Update submodules on '6.1' in qt/qt5 
Change-Id: I58e13476785689990cf1eca7be67b9203f629ee6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-26 13:29:08 +03:00
Qt Submodule Update Bot
dc86f0b8cf Update submodules on '6.1' in qt/qt5 
Change-Id: Ie44905fa87d86677ebf6c485cad3444d47838c01
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-26 06:45:17 +03:00
Qt Submodule Update Bot
eea35d68eb Update submodules on '6.1' in qt/qt5 
Change-Id: Ifc6a69250060a041a2b92f3749b6420904192b0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-23 05:27:50 +03:00
Qt Submodule Update Bot
51672128d8 Update submodules on '6.1' in qt/qt5 
Change-Id: Iaa9f8d54068c9ad04526566a89b12e404edb0358
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-23 00:59:15 +03:00
Qt Submodule Update Bot
5664753a15 Update submodules on '6.1' in qt/qt5 
Change-Id: Ib94bee450348164dd5b15da29ed72bdf3dbb04eb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-22 17:37:18 +03:00
Heikki Halmet
5006ab574e Provisioning: Remove mac certificates and signing tools 
Those will be provided by Coin

Change-Id: Id38b99b11d8b7988d743fc8a302760c3286087ff
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 4e09a6db79)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-22 08:39:20 +00:00
Qt Submodule Update Bot
77c4c3ba73 Update submodules on '6.1' in qt/qt5 
Change-Id: Ic8c67f07491674c168cba3061644474a03395a36
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-22 06:54:07 +03:00
Heikki Halmet
4826854f3b Provisioning: Add Vulkan installation for Ubuntu 20.04 
Vulkan is needed by examples

Task-number: QTBUG-92545
Change-Id: I2f814e452c88c04919b26eb42e90bac18356bbe7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 027f8ccb08)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-21 17:37:03 +00:00
Qt Submodule Update Bot
b6e3ff2ffe Update submodules on '6.1' in qt/qt5 
Change-Id: I12a0f34630575c253f279c765a1718c960ebbcb4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-21 20:37:03 +03:00
Johanna Äijälä
7231d7ccf7 Provisioning: Fix Squish for Qt6 on macOS 
Add correct Squish package to the 'squish_for_qt6' location.

Change-Id: Ib997092a5d6350d9b7298d7cc8baf5a2afaca702
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 03821e82a5)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-04-21 09:01:35 +03:00
Qt Submodule Update Bot
20414da7c9 Update submodules on '6.1' in qt/qt5 
Change-Id: Ie2d5c1c75a5dc3c51d7cbc387a5ee1c877209852
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-21 06:06:11 +03:00
Qt Submodule Update Bot
255e5c40ac Update submodules on '6.1' in qt/qt5 
Change-Id: Ia69c6f9309884f007b77a876cebc29eae8229cf8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-21 01:40:11 +03:00
Qt Submodule Update Bot
0be9fd1160 Update submodules on '6.1' in qt/qt5 
Change-Id: I1a136b6b17321a5b6c0a48bc7b9ab85a9917c4a1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-20 14:40:18 +03:00