Commit Graph

5368 Commits

Author SHA1 Message Date
Michal Klocek
9de403d32f Install 'dataclasses' python module for RHEL-8.8 as well
Install missing 'dataclasses' module for python.
It is required for licenses generation for webengine.

Make pip call after pip 'upgrade'.

Change-Id: Iedced50fe644c1711ee42d4940f70a24a070c4df
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
2023-07-25 15:52:54 +03:00
Dominik Holland
b87b44168c Provisioning: Remove the special wheel cache for python3 packages
It should be replaced with a global pip cache in the long run.
Removing it should make the maintenance of the required packages easier
as it can be done within the modules instead of in the global
provisioing scripts.

Pick-to: 6.6
Change-Id: Ief9832a8a640ce98325cda015d0a9e89d6cb16af
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-07-25 15:52:51 +03:00
Simo Fält
8b8bd315f9 Make android-13-RHEL-8.8-x86_64-on-linux test as insignificant
The config is currently blocking CI.

Task-number: QTQAINFRA-5606
Change-Id: Iebe1e11cbae0405fa1d1acd05581d62058ee8a06
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2023-07-24 13:57:43 +03:00
Marc Mutz
75486e8c60 Revert "Enable Unity Build on Qt Base for macOS -developer-build"
This reverts commit 6f3ff63da5.

Unity builds have not been properly tested. In particular, they have
not been tested with an "infinite" batch-size (e.g. 100,000) to
reasonably ensure that any batch-size will work and any _new_ .cpp
files being added to SOURCES will break unity-build only in a way
that's fixable by changes in _that_ .cpp file.

The CI is not a lab for experiments. A unity-related failure has
brought the branch:dev CI to a screeching halt for a day on
2023-07-20, so we're disabling the use of it on the CI until it has
been properly tested in nightly builds and locally.

Task-number: QTBUG-109394
Change-Id: Ib1605c02bc088942acc7dfe90b3b0e39f46a41e3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-07-21 11:41:29 +02:00
Marc Mutz
bd1fda1410 Revert "Enable Unity Build on QtBase for 3 Configurations"
This reverts commit 7b7dd85ca6.

Unity builds have not been properly tested. In particular, they have
not been tested with an "infinite" batch-size (e.g. 100,000) to
reasonably ensure that any batch-size will work and any _new_ .cpp
files being added to SOURCES will break unity-build only in a way
that's fixable by changes in _that_ .cpp file.

The CI is not a lab for experiments. A unity-related failure has
brought the branch:dev CI to a screeching halt for a day on
2023-07-20, so we're disabling the use of it on the CI until it has
been properly tested in nightly builds and locally.

Task-number: QTBUG-109394
Change-Id: I0933d912215e8303e982c8649bc448103568ea65
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-07-21 11:41:26 +02:00
Marc Mutz
4ffec4a809 Revert "Enable Unity Build on Qt Base for LLVM, and MinGW on Windows"
This reverts commit d1496ac752.

Unity builds have not been properly tested. In particular, they have
not been tested with an "infinite" batch-size (e.g. 100,000) to
reasonably ensure that any batch-size will work and any _new_ .cpp
files being added to SOURCES will break unity-build only in a way
that's fixable by changes in _that_ .cpp file.

The CI is not a lab for experiments. A unity-related failure has
brought the branch:dev CI to a screeching halt for a day on
2023-07-20, so we're disabling the use of it on the CI until it has
been properly tested in nightly builds and locally.

Task-number: QTBUG-109394
Change-Id: I935879b6b8a9602fcfbfcaa1d38b0b08254e0f59
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-07-21 11:41:22 +02:00
Alexey Edelev
b028d7499f Disable native_grpc feature for "Packaging" platforms
Native gRPC channels rely on the reference gRPC implementation that
doesn't guarantee the ABI compatibility between different versions. We
shouldn't link libQt6GRPC to any 3rdparty libraries that are not
delivered as part of Qt when make packaging builds in CI.

Task-number: QTBUG-115055
Task-number: QTBUG-110107
Pick-to: 6.6 6.5
Change-Id: Ie099b0af833d87308179d3b4eecc47738078010c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-07-20 17:13:40 +00:00
Assam Boudjelthia
f769f7296d COIN/ANDROID: Add WarningsAreErrors to RHEL 8.8
Amends 00e49b4beb. RHEL 8.8 targets
were added recently and the original change didn't account for that.

Change-Id: I97c0297ab4637efe075f11aabf08c0b41540beb6
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-07-20 20:13:40 +03:00
Assam Boudjelthia
f6d8a7ddb9 Add file names to .gitignore
* CMake's .user files created by Qt Creator.
* .vscode Visual Studio Code config folder.
* .DS_Store macOS files.
* In tree build folders.

Pick-to: 6.6 6.5
Change-Id: Id23358759c1e18d72fd88c399732ea58693af09d
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-07-20 20:13:40 +03:00
Marc Mutz
d316e8dff4 Revert "Set -unity-build-batch-size to 16"
This reverts commit 7409b0a6f3.

Reason for revert: Breaks qtbase builds.

Change-Id: I225ae701c211a0af30b1a03a8204ce47b6e91000
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-07-20 16:04:56 +00:00
Amir Masoud Abdol
7409b0a6f3 Set -unity-build-batch-size to 16
This changes the -unity-build-batch-size of the platforms that we are
experimenting with from 32 to 16.

Change-Id: Iefc70b482ae86313d2b2d10ff1adb862eb7e2138
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-07-19 20:57:44 +02:00
Konrad Kujawa
8db9f452d0 Add missing CMake arg to macOS developer build on ARM
Add missing OPENSSL_ROOT_DIR to macos-12-arm64-developer-build
CMAKE_ARGS.
OPENSSL_ROOT_DIR is required to run QtGRPC auto tests.
Add missing provisioning script to macOS 13 x86_64.

Fixes: QTBUG-115077
Change-Id: Ia51d6820037e93d5eddb06a2fdedfcfa87ee094e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-07-19 08:58:18 +02:00
Allan Sandfeld Jensen
e8f9c3d1cf Update node.js on RHEL 8.8 as well
Last update only touched RHEL 8.6 and 9.0

Pick-to: 6.6
Change-Id: I0c084edc08f3c833daa25c393674bd51eac4ea6e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2023-07-19 07:08:38 +02:00
Topi Reinio
dfc9955a95 Re-enable documentation testing in CI
Commit 204ea530 disabled documentation testing, as 'TestDocs'
is a testing-only step, and it was combined with 'DoNotRunTests'.

Move the feature under the new test-only configurations.

Pick-to: 6.6 6.5
Change-Id: Ie458495904b102fa50bc18ea39167ecc89b7c03b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2023-07-15 21:14:35 +00:00
Alexandru Croitor
c971db7e5b CMake: Don't load QtAutoDetect for top-level standalone tests
We don't load it for qtbase standalone tests, we shouldn't for
top-level builds as well.

This brings us one step closer to fixing top-level standalone tests.

Pick-to: 6.5 6.6
Change-Id: I7c2710e61951f6789fea63422bc575a1ac611cdc
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-07-08 08:49:19 +02:00
Simo Fält
497bd051e4 Upgrade MSVC 2022 and 2019 for Windows 11 22H2
Change upgrades also build tools for both visual studios

MSVC 2022: 17.6.4
MSVC 2019: 16.11.27

Change-Id: Icb847704636467d133fa578e46e93b6973aeb0a9
Pick-to: 6.5 6.6
Task-number: COIN-1059
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2023-07-04 21:33:41 +03:00
Amir Masoud Abdol
d1496ac752 Enable Unity Build on Qt Base for LLVM, and MinGW on Windows
Enable unity build for LLVM, and the last MinGW platforms on Windows.

Change-Id: I9f36ca8b0268f13886e319ea3211744fc377bc69
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-07-04 13:56:45 +02:00
Amir Masoud Abdol
6f3ff63da5 Enable Unity Build on Qt Base for macOS -developer-build
In order to monitor, and compare the performance of unity build, this
patch enables the unity build on `macos-12-arm64-developer-build`
and `macos-12-arm64-developer-build` platforms.

Change-Id: I4d8f864a821cf4cefcc10015950d0e994c7ba8a4
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-07-04 13:56:39 +02:00
Qt Submodule Update Bot
58f39595a7 Update submodules on 'dev in qt/qt5'
Change-Id: Ie4d3aafd362263d1f46f623a82a2cd5ba87a15f6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-04 06:28:36 +00:00
Fredrik Ålund
af7c74313d Add missing provisioning scripts for Mimer SQL for RHEL 8.6 and RHEL 8.8
The provisioning scripts for Mimer SQL is missing in RHEL 8.6 and
RHEL 8.8 and therefore the Mimer SQL QtSql plugin is not built

Fixes: QTBUG-111219
Pick-to: 6.6
Change-Id: I9c12b7d94ab7b047ed08b46043ad16586968ecfd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-07-03 22:51:18 +02:00
Mikolaj Boc
d669e6faa2 Enable tests for webassembly-linux-thread-asyncify
This commit enables tests in CI for Wasm platform.

Fixes: QTBUG-109786
Change-Id: Ia44ab6ce3d5092fc90b07759d4d1a2c57edbf512
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
2023-07-03 09:12:40 +02:00
Heikki Halmet
6341108c6f Upgrade MSVC 2022 and 2019 for Windows 10 22H2
Change upgrades also build tools for both visual studios

MSVC 2022: 17.6.4
MSVC 2019: 16.11.27

Pick-to: 6.5 6.6
Task-number: COIN-1059
Change-Id: Id212d396a58827d5794158a4b314ec65ad5a3f47
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
2023-07-03 08:10:23 +02:00
Assam Boudjelthia
00e49b4beb Android: Add WarningsAreErrors to Android targets
To avoid warnings accumulating without being noticed.

Change-Id: I9979560a708c08f21966036b37d32a976fb75f8d
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2023-06-30 09:48:55 +03:00
Simo Fält
86cb676f3c Add qtmultimedia as a recommended dependency for qt3d
Qt CI requires qtmultimedia binaries to create debian packages.

Change-Id: Ib29cefe15db7f32fb9457320d899a4996bda6cba
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 6bedd9ec81)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-30 06:48:52 +00:00
Qt Submodule Update Bot
d6ec2355f1 Update submodules on 'dev in qt/qt5'
Change-Id: I37d5f623a681a934ee0ebeb0302478c596495f92
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-06-30 06:48:52 +00:00
Qt Submodule Update Bot
896b1e23b7 Update submodules on 'dev in qt/qt5'
Change-Id: Ifd193f92b04b725f7c5956ff52f700623e048cb2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-06-28 16:07:01 +00:00
Tor Arne Vestbø
2802d1debb Remove CMake and Ninja version requirements from README
There are many details, as documented by the online documentation.

Task-number: QTBUG-114869
Pick-to: 6.6
Change-Id: I3b5b6679264a7cb0f5deddad3385af9bd46693f8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-06-26 16:38:02 +02:00
Tero Heikkinen
5cca2b7ba4 Add Red Hat 8.8 to CI
RHEL 8.8 will be added as parallel with RHEL 8.6 until packaging
site gives green light to remove the older Red Hat version.

Removing also some obsolete package installations.

Task-number: QTQAINFRA-5600
Change-Id: Ie77500a805a89db9019b5347539e662bc016af59
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-06-26 15:50:30 +03:00
Amir Masoud Abdol
7b7dd85ca6 Enable Unity Build on QtBase for 3 Configurations
Enabling the -unity-build for qtbase for INTEGRITY, Windows 10/11 MinGW.
For now, we need to explicitly disable it for other modules, as
QT_UNITY_BUILD is being propagated by `QtBuildInternalsExtra` to other
modules.

Task-number: QTBUG-109394
Change-Id: I38525706149eadba91bdebc78d502fd5f42f69aa
Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-06-24 15:29:46 +00:00
Jøger Hansegård
c4d26fe1d2 Enable rebuilding FFMPEG for MSVC without deleting lib files first
To simplify testing modifications to the FFMPEG library, it is nice to
be able to rebuild FFMPEG without having to manually delete lib files
first. This change makes this possible because it uses powershell
Move-Item instead of Rename-Item to rename .o files to .lib files.
Move-Item's -Force argument allows renaming files to destination that
already exists.

Pick-to: 6.5 6.6
Change-Id: I0a56776d38c37d38d1cd74b5186881fc955d51f0
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-06-24 15:29:41 +00:00
Assam Boudjelthia
501087faf6 Android: fix outdated target id names in tqtc-android-automotive target
Amends ef12163e25.

Task-number: QTQAINFRA-5431
Pick-to: 6.6 6.5 6.5.2
Change-Id: Ifa8446b1432223924d8af15322b1982bc33fa29c
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
2023-06-24 18:29:36 +03:00
Piotr Wierciński
13c53ef79f wasm: update emscripten to 3.1.37
Qt 6.6 will require emscripten 3.1.37

Pick-to: 6.6
Change-Id: I24d172b9ba055c690274a99af109b50cd2f79b88
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
2023-06-24 17:29:31 +02:00
Qt Submodule Update Bot
c77a1f7e4c Update submodules on 'dev in qt/qt5'
Change-Id: I9f0190346f594318341964896bf80d6caaa33f4b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-06-22 09:11:46 +00:00
Heikki Halmet
ac33d86e9a Add macOS 13 x86_64 to CI as build and test target
macOS 12 x86_64 will be replace with macOS 13. Tests will be still run
on macOS 12

Let's keep same Xcode version (14.2) than older macOS (12) has

Task-number: QTBUG-104210
Change-Id: If3e06834156196917001f83ca391a66a6c78e84a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-06-20 09:32:57 +00:00
Tor Arne Vestbø
8214de5e0e Remove conan profiles
The conan experiment has ended, and the files are only bitrotting
nowadays.

Pick-to: 6.5 6.6
Change-Id: Iefdc6fa1a48bb4062b15cf035f372a2d44bddda9
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-06-20 11:32:52 +02:00
Assam Boudjelthia
4e59702b14 Coin:Android: unify and update OpenSSL provisioning scripts
Use the same prebuilt pacakges for all platforms since the prebuilt libs
are going to be used for the target and they are not tied to the host.

Pick-to: 6.6 6.5
Task-number: QTBUG-110025
Change-Id: I2c79722989902b16883b31cbc6e140855239fcc8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-06-20 12:32:48 +03:00
Allan Sandfeld Jensen
d764e8fe39 Update node.js on Linux/macOS
Qt WebEngine 6.6 need 14.19+

Pick-to: 6.6
Change-Id: Idf2d54fcdc55762cd9d8cfe5248858bd00afe89c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-06-20 11:32:44 +02:00
Allan Sandfeld Jensen
de0104b3ed Update node.js on Windows to 18.16.0
Needs to be at least 14.19 for Qt WebEngine 6.6

Pick-to: 6.6 6.5
Change-Id: I1d4b8b241d18eeeffa1b2a9eed0e85cbf54e49ba
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-06-20 11:32:40 +02:00
Simo Fält
82327bfc4d COIN: Disable linux on arm config again
The only host is down for now.

Pick-to: 6.6 6.5
Change-Id: I82cc9461a16d054da6611f2e2ee0be6426755660
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-06-15 07:31:25 +00:00
Heikki Halmet
deb86a4fb8 Remove macOS 13 x86_64 nightly run
macOS 13 x86_64 will be added to blocking CI

Change-Id: I1d6fa17d3274c3c635a29d671fff1538ba17ddf5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-06-14 07:19:50 +00:00
Jani Heikkinen
21f55b70ed Add missing optional dependency for qtgrpc submodule
qtgrpc recommends qtdeclarative; add that one in .gitmodules as well;
the dependency were added in the module in
681d104f0d03f97681536d3691d170d7c06aab2b

Pick-to: 6.6 6.5
Change-Id: I325abc8453d26cf0d75425e806e3e0e7b182070a
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-06-14 07:19:46 +00:00
Allan Sandfeld Jensen
14f7603e91 Fix SetEnvVar for Debian
Pick-to: 6.6 6.5
Change-Id: I4152575cc071ea7f51e102a3807b05ed9f89d2fd
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2023-06-14 09:19:43 +02:00
Heikki Halmet
2ae9a6c099 Provisioning: Ignore unmount result with Squish script
Unmounting fails sometimes which cause provisoning failure.
Let's ignore the result

Task-number: QTQAINFRA-3709
Pick-to: 6.6 6.5 6.2 5.15
Change-Id: Ifc321c8ef9942f9f51ec622370aadbbbb862d262
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-06-14 07:19:40 +00:00
Kai Köhne
c230f55f20 Provisioning: Remove QDOC_USE_STATIC_LIBCLANG
Remove handling of QDOC_USE_STATIC_LIBCLANG environment
variable. The variable is not used by the Qt 6 build
system.

Change-Id: I8af68382caea2864543a3d6e6ed2922823a2e71d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-06-12 12:10:49 +00:00
Casimir Saastamoinen
ba72dbb10e Install openssh win32 and win64
Task-number: COIN-713
Change-Id: I78c88edf4d1560f4a85024832fb158480ab268d0
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-06-12 15:10:45 +03:00
Lucie Gérard
eecfb19548 Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Pick-to: 6.5 6.6
Task-number: QTBUG-67283
Task-number: QTBUG-108364
Change-Id: If26e4d35c780db4a7982bb84872b251dad24716e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-06-12 12:10:41 +00:00
Petri Virkkunen
3115ca5d17 Update Android Automotive emulator image in CI to use AAOS 12
Android 12 is the desired platform for most users, need to run our tests
on it instead of A11.

Task-number: QAA-1739
Change-Id: Iadfdfcbc97b062baa1c4ef6eb46e9e1af6e3478a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2023-06-12 15:10:37 +03:00
Joerg Bornemann
6c40b6160e init-repository: Fix wrong remote URLs in cloned submodules
The cloned submodules had a wrong origin remote URL if the origin remote
of the local qt5.git repository had a trailing slash.

Fix this by stripping the trailing slash when stripping the trailing
".git" from qt5.git's remote.

Pick-to: 6.5 6.6
Fixes: QTBUG-113793
Change-Id: I199b6e1915f67558ecfe69f7300d0f9ef0d4b232
Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2023-06-12 12:10:34 +00:00
Jøger Hansegård
cf4eabc8c2 Add CMakeUserPresets.json to .gitignore
The CMakeUserPresets.json file can be used to simplify configuring Qt,
particularly with tools such as Visual Studio and Visual Studio Code.

As opposed to the CMakePresets.json, the CMakeUserPresets.json should
only contain user specific configurations, and should never be checked
into source code management system. Therefore it makes sense to ignore
it globally.

Pick-to: 6.5 6.6
Change-Id: I971d4505b302dc40e3dd33b6d4680c2067047c27
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-06-12 12:10:30 +00:00
Tony Sarajärvi
58ddf7133c Correct the domain of ci-files01-hki
It's hasn't been .intra.qt.io for quite some time, it
has worked through an alias we have on the DNS server.

Change-Id: I0bc17668dacfea64c276bb553e75e4be16e97659
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-06-12 12:10:26 +00:00