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,384 Commits 118 Branches 270 Tags
625d6c4a30a6300a9477b3990b37aa73dd781b31
Commit Graph

4384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ville-Pekka Karhu
625d6c4a30 Provisioning: SLES 15 SP2 now uses our local repo clone 
Task-number: QTQAINFRA-3895
Change-Id: Ied30afb03543659f66f7b1eedae5249e09c40ae8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 966760de03)
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
 2020-12-23 17:46:42 +02:00
Qt Submodule Update Bot
719d7a509c Update submodules on '6.0' in qt/qt5 
Change-Id: I2855b33c347675829ecc03121bfb11943f464a16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-22 22:10:11 +02:00
Simo Fält
8ef9b169d9 Provisioning: Remove deprecated brew call 
Change-Id: If956d0f77cd5c6763fc2314277c346d8f27e6eee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 0350263a07)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-22 15:54:59 +00:00
Qt Submodule Update Bot
c93ab8e8c0 Update submodules on '6.0' in qt/qt5 
Change-Id: I3967d75e00ee6f63c1bbb827a4598c7db7c9e01b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-22 16:57:14 +02:00
Qt Submodule Update Bot
0136c1a1e5 Update submodules on '6.0' in qt/qt5 
Change-Id: Idfce3be588b08c29a2fe9930da9d41ea90e252ce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-18 09:01:47 +02:00
Qt Submodule Update Bot
3f7b562c53 Update submodules on '6.0' in qt/qt5 
Change-Id: I38bc2406a1b8cb34bea27d4565f1bc57a3ccb249
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-18 05:45:09 +02:00
Heikki Halmet
a17cf7f710 Provisioning: Set time zone to UTC on CentOS 8.1 
Change-Id: Id1747661b10fb24e2dd3aaa9af4dedafafbf764e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 6a9193ef40)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-17 20:27:24 +00:00
Qt Submodule Update Bot
347d95765c Update submodules on '6.0' in qt/qt5 
Change-Id: I863e112958b167d080a2ab4f3b28dc4b83eba806
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-15 22:08:19 +02:00
Allan Sandfeld Jensen
1bb37b8491 Add glproto-devel to openSUSE for webengine 
We now need glxtokens.h

Change-Id: I55bc2d195cb27b53ff0a2573e558e4cd40e67451
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d5eeee1cd2)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
 2020-12-12 17:21:04 +01:00
Allan Sandfeld Jensen
b25e56f27c Fix nodejs installation on windows 
Was unpacked into a subdirectory with the same name as the archive

Fixes: QTQAINFRA-4055
Change-Id: Ic11d2d926a1d2250b963010729d70bd00b992f89
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit e38fc45740)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-11 18:32:07 +00:00
Heikki Halmet
5e135cd7a5 Provisioning: Fix GCC installation for linux 
Pre-built package was missing from cache and source package
was named as pre-built package

Change-Id: I6d14b198ab7e3795e5f70986c9a50662225ac666
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 4aa14ea9d7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-11 10:44:33 +00:00
Qt Submodule Update Bot
6e6fe08621 Update submodules on '6.0' in qt/qt5 
Change-Id: Ice898c9c8902f3f9761e567ce528548dca6bbf1e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-11 08:38:36 +02:00
Qt Submodule Update Bot
e183790ada Update submodules on '6.0' in qt/qt5 
Change-Id: Ia061e1a4024957cf2f8e62f5367976c85f97a0dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-11 05:35:23 +02:00
Qt Submodule Update Bot
60b8dc8d24 Update submodules on '6.0' in qt/qt5 
Change-Id: I551c1d9eb917fa943292036b557cb0749f5499ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-11 00:22:50 +02:00
Qt Submodule Update Bot
d3762b3acd Update submodules on '6.0' in qt/qt5 
Change-Id: I35cdb6893e2440c39a48b4a1cc63fd50ddf0b8ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-10 08:24:41 +02:00
Qt Submodule Update Bot
2e7b4c7458 Update submodules on '6.0' in qt/qt5 
Change-Id: If366e2923a0813edfc5ff9b29d0293c69d78cc76
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-10 01:55:28 +02:00
Qt Submodule Update Bot
b849bd519a Update submodules on '6.0' in qt/qt5 
Change-Id: Ib905b2ff5255d761c0799a25d81055fc93734a6d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-09 20:51:13 +02:00
Qt Submodule Update Bot
31eb901d0e Update submodules on '6.0' in qt/qt5 
Change-Id: I2f4efd23bd455b455c4d6e17afa12c8a99bc4535
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-09 15:14:52 +02:00
Qt Submodule Update Bot
6281f01242 Update submodules on '6.0' in qt/qt5 
Change-Id: I294b43e2e35e4a4dcc81a33b075efb875f853eb0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-09 07:48:18 +02:00
Qt Submodule Update Bot
a1c5437c8f Update submodules on '6.0' in qt/qt5 
Change-Id: I6762aa1d259813805faba9d43619c68e526aaf4e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-09 02:23:26 +02:00
Qt Submodule Update Bot
c274817df5 Update submodules on '6.0' in qt/qt5 
Change-Id: I7cacaa20dc5d5d7fe674600eae12e39591063044
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-08 21:17:51 +02:00
Qt Submodule Update Bot
e0b77636a9 Update submodules on '6.0' in qt/qt5 
Change-Id: Iefe1ca76b5e14bcb533a7eab772931f0e88a3472
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-08 15:41:51 +02:00
Tony Sarajärvi
6043c98a6c Disable LSO regardless of network interface name 
Change-Id: Ie439e11d9de6f71f4562b014b80a32fbf7660883
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 1015211da7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-08 08:06:57 +00:00
Heikki Halmet
877cbac46e Change network adapter name for Windows 10 x86 
Different Windows versions seems to use different name
for network adapter. Let's move this from common scripts
folder to Windows 10 platform folder

Change-Id: I6a4a15ead41aef2e79b1b7782f1c5ffa6e46cae1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit bb4606c5c8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-07 11:29:54 +00:00
Qt Submodule Update Bot
f94941550d Update submodules on '6.0' in qt/qt5 
Change-Id: Ie2097f271f8efbd0a58ddb614f92c7914cb47dd5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-05 10:00:39 +02:00
Qt Submodule Update Bot
10ca5431db Update submodules on '6.0' in qt/qt5 
Change-Id: I616a296bd29546d4a7f396fe1b91ac345b747492
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-05 05:42:24 +02:00
Qt Submodule Update Bot
46434aa0fb Update submodules on '6.0' in qt/qt5 
Change-Id: Iec66d3fd0cc2a1ca5a038c7327becb51a5d71026
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-04 23:19:30 +02:00
Kai Koehne
d072975076 Mark 'CMake Topological Sort' attribution as tools related 
The code is only used for building Qt, and not shipped by customers.

Change-Id: I0e255fe674b1703160608ab6b208918ea511baa4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 478c779baf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-04 15:38:15 +00:00
Heikki Halmet
1f423ab325 Update Windows 10 x86_64 version to 20H2 
Windows 10 Enterprise 20H2, OS build 19042.508
Additional SW:
MSVC 2019 version 16.8.1
MSVC 2019 Build Tools version 16.8.1
MSVC 2015 14.0.25420.1
Virtio driver
Virtio Balloon driver
NetKVM driver
Vioserial driver
Guest-agent qemu-ga-x86_64

Task-number: QTQAINFRA-3961
Change-Id: I8abc7ac011c58ad13db433fc86a1327afceafc68
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 420d7f809c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-04 13:35:16 +00:00
Qt Submodule Update Bot
60dee9adf9 Update submodules on '6.0' in qt/qt5 
Change-Id: I73d0c87f1d572030eadcaf72ef0bfbfde3ddfb7b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-04 14:09:28 +02:00
Qt Submodule Update Bot
1128c011ae Update submodules on '6.0' in qt/qt5 
Change-Id: I5fe92b3ab9222b6c5f0d1d7311592b6eebc74872
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-04 09:07:17 +02:00
Qt Submodule Update Bot
d22f382d28 Update submodules on '6.0' in qt/qt5 
Change-Id: I14f6c15f746985faa5397d46d6f792e4e7a71d94
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-04 03:57:33 +02:00
Alexandru Croitor
00c1092864 CMake: Add headersclean feature to the packaging configs 
Task-number: QTBUG-86053
Task-number: QTBUG-82615
Change-Id: I89ed5b80b1c6fb793cfec5921b489cbd7693db20
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 45ce639a62)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-03 16:28:40 +00:00
Qt Submodule Update Bot
4b2445ddd7 Update submodules on '6.0' in qt/qt5 
Change-Id: Iadcbcc4063dc71aca05b747ff3c53916afea81ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-03 17:42:05 +02:00
Heikki Halmet
c226ad7762 Provisioning: Install Azure tool 
Task-number: QTQAINFRA-4042
Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit cdea442a3a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-03 13:04:18 +00:00
Heikki Halmet
fd6af776aa Provisioning: Install Dotnet SDK 2.1 
Dotnet is needed for Azure installation

Task-number: QTQAINFRA-4042
Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8846d0d52d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-03 13:04:18 +00:00
Qt Submodule Update Bot
19c08829e1 Update submodules on '6.0' in qt/qt5 
Change-Id: I840de94ffdee57fee505109e825e2094c68816e2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-03 10:21:21 +02:00
Volker Hilsheimer
a5d236688f Add worktrees as detached 
Since we later check the worktree out to the revision specified
in the dependency file, add it as detached to avoid conflicts
with already existing worktrees for the default branch.

As a drive-bye, fix a typo in a comment.

Change-Id: I81c30c1fa3cfc9831fe7884a103746b43478dd8e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 5bbec95c48)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-02 11:17:07 +00:00
Volker Hilsheimer
034a1967a6 Initialize missing submodules if a supermodule is present 
When fetching dependencies, the submodule directory might not exist
or might be empty. If so, try to initialize the submodule before trying
to add the worktree.

Change-Id: Ie4d6ec483ac9ea3f9207d5ab4cea34d6e0fb2921
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 21fea13125)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-02 11:17:07 +00:00
Qt Submodule Update Bot
de49143621 Update submodules on '6.0' in qt/qt5 
Change-Id: I345488cc1d0d0dec3fbd38bf08ded7d87d137648
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-01 23:24:32 +02:00
Volker Hilsheimer
367b81813b Support absorbed and unabsorbed submodules 
Modern git usage for submodules is that the git object storage is absorbed
into the supermodule (see git submodule absorbgitdirs).

Handle both cases when trying to locate the gitdir for the target module.

Change-Id: Icddbae3a4d9a8823551106f089dbbff2c935ff35
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b6dfb5e295)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-01 20:47:18 +00:00
Qt Submodule Update Bot
15b37f55a6 Update submodules on '6.0' in qt/qt5 
Change-Id: I6053930444d942c7c050015e1d7b72dbcf0c5ea2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-01 17:18:24 +02:00
Alexandru Croitor
bf86eece2f Mark Android test config as InsignificantTests 
The qtbase Android test job often times hangs, causing other
integrations to fail. Until the issue is fixed, mark the config as
InsignificantTests.

Change-Id: I4921d5a830bf49cb144a6e93bd4e3a6ee34f216f
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit b8ae74d78a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-12-01 13:01:15 +00:00
Qt Submodule Update Bot
8df3909e6b Update submodules on '6.0' in qt/qt5 
Change-Id: I2631ceb1730fa9f249c4400e6e4a19df36bd510d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-12-01 11:47:45 +02:00
Simo Fält
5c41da419c Add platform configs for Pyside-setup 
While default.txt contains configs with UseLegacyInstructions it can't
be used by pyside-setup, while it falls back to COIN's legacy
module class.

Change-Id: I5d2856344b817f6085ba66643f47803ccee29b06
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 32d8d76755)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-11-30 21:35:11 +00:00
Qt Submodule Update Bot
f7123cbd51 Update submodules on '6.0' in qt/qt5 
Change-Id: Ic93e8662c04a4a0918c18bd56980ad2214fde330
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-11-27 18:21:46 +02:00
Toni Saario
140c572d80 Add upload for the documentation artifact 
The upload for the documentation was missing.

Change-Id: I9f1df81ecee3bbf6dd1128d24ae4fd2717bb3dcb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 0848b04307)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-11-27 12:26:49 +00:00
Qt Submodule Update Bot
3fc9dc5b8e Update submodules on '6.0' in qt/qt5 
Change-Id: I18461101720721a3bc6c1f6fc763c561832021ed
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
 2020-11-25 09:09:34 +02:00
Joerg Bornemann
73bd86160c CMake: Adapt to new QT_BUILD_TESTS variable 
Change-Id: Ib35e164a8628ffc7d1429ba4756a27d4b98977e2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 87269f4353)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-11-25 07:09:13 +00:00
Assam Boudjelthia
fa97357639 Android: update build tools and SDK level to 29 in CI 
Change-Id: I6f831882f1e4c2ba68cbd70d03b72a9337211fbf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit 9b5c3f0a6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-11-24 18:26:58 +00:00