Commit Graph

4367 Commits

Author SHA1 Message Date
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
Simo Fält
ba69020820 Add CI config to run Android x86 test in emulator
Task-number: QTQAINFRA-3867
Change-Id: Icabb8e5cd880087abcf1d2c68ac126a4d8bf8687
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 1468849b30)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-11-23 17:56:41 +00:00
Volker Hilsheimer
8ea1c6ba02 Be less quiet when cloning or adding worktrees
Since doing either for qtbase and qtdeclarative can take a long time,
and since it's a relevant change to the local file system, log what's
going on.

Swallow output from most git commands unless cmake runs in VERBOSE
mode.

Change-Id: I984915689247d6372240744b5bc9183660046084
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 302548040c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-11-21 04:42:54 +00:00
Alexandru Croitor
c8a3d008b3 CMake: Update provisioned CMake to version 3.19.0
Change-Id: I9c5be93146882d5593bbe46811a653d6b2a88aee
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 6b46bc3b7b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-11-20 20:09:49 +00:00
Jani Heikkinen
15d7b31e50 Adjust submodule branches
Change-Id: I319600a17f3ad6af3a481c62782bd8c3d7f36676
2020-11-20 08:55:26 +02:00
Qt Submodule Update Bot
8c984b9fb0 Update submodules on 'dev' in qt/qt5
Change-Id: I03c1da4b91fce866eb2f68a7baabd3aee51544ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-20 03:50:52 +02:00
Qt Submodule Update Bot
f1ed0045c9 Update submodules on 'dev' in qt/qt5
Change-Id: I10a79f6fa3316d8e373aedc9b770cad4b042f890
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-19 21:02:23 +02:00
Alexey Edelev
0393017610 CMake: Fix fuzzer-no-link check for super builds
Add platform detection before report enties evaluation in root
CMakeLists.txt. QtPlatformSupport.cmake defines required
platform-specific variables line CLANG before
qt_configure_eval_commands call.

Fixes: QTBUG-88496
Change-Id: I13afdbe29f2bffeb2c36c17e231b98b2aa2b41e6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
2020-11-19 12:57:58 +01:00
Qt Submodule Update Bot
85e32ebcb4 Update submodules on 'dev' in qt/qt5
Change-Id: If0f3226d32bc0fdd58072f91d94ba37829799d3d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-19 13:16:26 +02:00
Qt Submodule Update Bot
fdbe2867cf Update submodules on 'dev' in qt/qt5
Change-Id: I96b4e23179003371db3c2f0bab69858a466fe09e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-18 21:33:41 +02:00
Qt Submodule Update Bot
768edb9eeb Update submodules on 'dev' in qt/qt5
Change-Id: Ia116b16307f6234996bb79c703a94ed6aff1b2eb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-18 15:28:47 +02:00
Volker Hilsheimer
c47432eda3 Make syncing script capable of setting up new worktrees and clones
For missing dependencies, create worktrees from existing clones if
found, otherwise clone from the same remote.

Change-Id: Ie624e6c1b3f621dce43ee8cc7f06ce469851285b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-17 16:40:45 +01:00
Volker Hilsheimer
f8b8a9a59f Add a script to synchronize the repo to a consistent (sub)set
Make a few modifications to the dependency evaluation to include the
revision of each dependency, and a method that checks each dependency
out to the revision necessary to create a consistent set for the
requested module.

If the requested module is ".", check all modules out to the given
revision.

Can be called (ideally from a git-sync-to alias script):

cmake -DSYNC_TO_MODULE="$1" -DSYNC_TO_BRANCH="$2" \
      -P cmake/QtSynchronizeRepo.cmake

Change-Id: I007e9f9023bae949907b64e264ae7869dff1da2e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-17 16:40:41 +01:00
Tony Sarajärvi
c4c11e016f Remove icu provisioning from 32 bit Windows 10
Fixes 2fb5125e5b which was incomplete

Change-Id: I80392c63fff1de53780416fa8e3e04ef2990323d
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2020-11-17 12:28:33 +00:00
Tony Sarajärvi
66b345fdbb Swap static builds between openSUSE and SLES
By moving the static build to SLES, we can run autotests on openSUSE.
It also makes sense to move the developer build at the same time.

Change-Id: I5e0c4b0caf2bbd5a0d419555b1e270673adfc890
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-11-17 13:19:53 +01:00
Ville-Pekka Karhu
dac8188d90 Provisioning: Install QEMU Guest Agent to Linux
Task-number: QTQAINFRA-2462
Change-Id: I1d74a886a3056d3d8b7ca7bce676701c15e67c6f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-16 15:13:21 +02:00
Tony Sarajärvi
2fb5125e5b Clean up unused provisioning scripts
Change-Id: Id6c5de28bde4a7870eb33d685c948bfcf48cb367
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-11-16 12:29:22 +00:00
Alexey Edelev
c7c8d1e064 CMake: Check module dependency before configure
Move all modules dependency check before actual configuration of
any module.

Change-Id: I40838ab59de1be1cd8ca3a006e195455f2692982
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-16 12:56:01 +01:00