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,632 Commits 118 Branches 270 Tags
031031cd2b16affd4fd28789300a76fb24d521dd
Commit Graph

4632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Qt Submodule Update Bot
6161f9eee9 Update submodules on '6.1' in qt/qt5 
Change-Id: I7aed053eaa7aeae4a0fea448d810ee03d1583606
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-20 08:59:19 +03:00
Qt Submodule Update Bot
67f7febe20 Update submodules on '6.1' in qt/qt5 
Change-Id: Ie0d89d04057d1e8d483b9356f6b2bd9c853fc3a5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-20 02:12:27 +03:00
Heikki Halmet
45b0631986 Provisioning: Upgrade MSVC 2019 version to 16.9.4 
Task-number: QTQAINFRA-4117
Change-Id: Iefb5c8b97b3f56d9cdb358dbbf70d4c9de1b7d1b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9200ee7384)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-19 18:04:59 +00:00
Heikki Halmet
2887ee428b Provisioning: Resize ulimit value for open files 
Linker for Qt Webengine builds needs to open multiple files.
Without this it will hit the limit

Task-number: COIN-699
Change-Id: I53b8c38a4f719714971ca6a4b65349716a873170
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit a4b61379ca)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-19 18:04:59 +00:00
Qt Submodule Update Bot
cad737b35e Update submodules on '6.1' in qt/qt5 
Change-Id: I61503b6e0814308aadf9434b7965c2e48bd49104
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-19 16:58:02 +03:00
Heikki Halmet
d0eb86df6c Provisioning: Install prebuilt OpenSSL Android 
OpenSSL 1.1.1 can't be build against Android NDK 22. Current OpenSSL
prebuilt was made against NDK 21.

Task-number: QTBUG-92075
Change-Id: I0e8a3017a9482ef269d736a8702b29b6bec1c2b2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit ca14882321)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-16 07:34:38 +00:00
Assam Boudjelthia
27dbfe6607 Update NDK to r22b 
Qt quick 3D apps crash because of a bug caused by NDK r21
https://github.com/android/ndk/issues/1148, NDK r22b solves
the problem.

Task-number: QTBUG-91782
Task-number: QTBUG-92075
Change-Id: I92098c26f3bd9fcfc342ced42c9a81f1e34af8d6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 53fc7d424d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-16 07:34:30 +00:00
Alexandru Croitor
2b9697ed7f CMake: Use qtbase's version as the top-level project version 
This avoids the need to bump the qt5.git project version when
branching the next minor Qt version.

Task-number: QTBUG-92861
Change-Id: Ib20ab614caefece00bd9e0172d9269077239ba6a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 002b6f075c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-15 21:22:26 +00:00
Qt Submodule Update Bot
0ed49f89a5 Update submodules on '6.1' in qt/qt5 
Change-Id: Iac9dc23391c41892609e7a6ea5802c466c60b459
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-15 15:34:40 +03:00
Qt Submodule Update Bot
e042c64218 Update submodules on '6.1' in qt/qt5 
Change-Id: I907405fe2d12e14d7bcef5087626dbed8c1a73ca
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-14 01:46:12 +03:00
Heikki Halmet
a0a78533a5 Provisioning: Reset Time Zone for macOS 10.14 
Setting Time Zone for macOS 10.14 seems to be flaky. Let's reset it. If
it still fails to set it then exit the script execution.

Task-number: QTBUG-92174
Change-Id: I07b28d0511d8fc097a1da43b78de9a5131f6bfa7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit ba149a162b)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit c84925c512)
 2021-04-13 13:55:16 +03:00
Heikki Halmet
09ed4e3325 Provisioning: Upgrade Xcode to version 11.3.1 for macOS 10.14 
Xcode 11.3.1 is the latest supported version for macOS 10.14
It seems that in macOS 10.14 xip-package can't be expanded
through mount. It need to be fetched first.

Change-Id: I8c53787a2edde6b50abc7ec099ecc10b7515df2e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 61d69b068f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-13 10:55:16 +00:00
Qt Submodule Update Bot
849998b25b Update submodules on '6.1' in qt/qt5 
Change-Id: I36ed1a3e69bcaaac6e18ac9b0c09460724d53501
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-13 12:17:38 +03:00
Qt Submodule Update Bot
c0e287063c Update submodules on '6.1' in qt/qt5 
Change-Id: I0bbbf6fa8db41f0891bf5701c8cb2e0e75cd146e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-13 06:45:14 +03:00
Matti Paaso
386c62a1b4 Fix qt-creator license check 
Change-Id: I7c9df1313075294ddfbfa8ceb14be267eacc3d2b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit 2140c07299)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-12 16:42:34 +00:00
Toni Saario
d1601aa0f9 Add conan to path 
Change-Id: I90e028409f606a703fd9b567a221f3f946f11d61
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 32579bc3c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-12 07:21:53 +00:00
Toni Saario
88b3474bcf Enable conan revisions mode 
Change-Id: I0fb9d6943cf0e6e54f631314a67348f703c31e41
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 3802e21afe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-12 07:21:47 +00:00
Toni Saario
1308663fd6 Update windows git version 
Older git version does not allow fetching specific revisions.
This makes it impossible to fetch the integrations revision of
the repository.

Change-Id: I513b0d1abb097d139f730ef0cdf2577b9d02e9f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 7381cbeca8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-12 07:21:41 +00:00
Toni Saario
0c6dc883e5 Provision conan on ubuntu 18 and macos 11 
Change-Id: Ie11e8bb2b39acd3ab6229cb211c37500cbb7ed77
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit f83567b7f5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-12 07:21:35 +00:00
Toni Saario
f5c5309067 Disable network LSO/TSO on linux and macOS VMs 
LSO/TSO causes problems handling network packets and deteriorates the
network speed to below 1MB/s.

Task-number: QTQAINFRA-4241
Change-Id: Ib999035668eefe51d59715c9a18f42c9e3dfdf21
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit db7926c715)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2021-04-11 20:21:19 +00:00
Heikki Halmet
42ee3f18fe Provisioning: Install Nodejs using pkg instead of Brew 
Openssl is one of Nodejs dependencies when installing it via
Homebrew which is causing issues with actual openssl source build during
provisioning

Task-number: QTQAINFRA-4402
Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 26c97222c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-11 15:57:09 +00:00
Jani Heikkinen
7722922b17 Drop Ubuntu 18.04 target from qtbase.yaml as well 
Change-Id: I033d8aa10b69a110fb1f51fd0620deba7ac559a9
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 9980240e33)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-09 12:12:10 +00:00
Jani Heikkinen
4aed038baf Drop unnecessary ci and packaging configurations 
- Drop Ubuntu 18.04 from CI; we aren't supporting it as development host
in Qt6. And we aren't using its prebuild binaries anywhere
- Drop 'Packaging' feature from QNX builds; we aren't packaging those
- Drop 'Packaging' feature from openSUSE builds; we aren't packaging those

Change-Id: Ic5c6e0e1c480946380cbcf4b01133caffe7a71e0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 7a8094dc9d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-09 08:22:03 +00:00
Matti Paaso
ee497a40f1 Add qt-creator platform configurations 
Task-number: COIN-491
Change-Id: I18b70a7157931f9fe0d42abf71f1bab6de6199c3
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit 9ad3578bc2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-09 06:22:23 +00:00
Qt Submodule Update Bot
39ba7a7d99 Update submodules on '6.1' in qt/qt5 
Change-Id: Ib450df7f19e6fe13135b1d23cb3114ce70591b82
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-09 08:41:36 +03:00