Commit Graph

278 Commits

Author SHA1 Message Date
Jani Heikkinen
c23af318f6 Revert "Temporarily remove packaging -flack from windows-11_22h2-arm64-msvc2022"
This reverts commit a9205624ea.

Reason for revert: "Fix" for signing issue is finally in and we need these WoA packages

Change-Id: I4e05e3be150c6f472f2088a4478c414f215deb80
Reviewed-by: Simo Fält <simo.falt@qt.io>
2024-05-23 04:54:52 +00:00
Jani Heikkinen
a9205624ea Temporarily remove packaging -flack from windows-11_22h2-arm64-msvc2022
Signing in windows-11_22h2-arm64-msvc2022 is broken so we need to remove
packaging flag temporarily to enable submodule updates

Fixes: COIN-1149
Change-Id: Ia4a3ab07f2204c18b0f54dbe24d1a95fd28cad18
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-05-16 07:39:16 +03:00
Jani Heikkinen
bf633f08b7 Optimize 'Packaging' flag usage
Add 'Packaging' flag for new Windows on Arm build.

Remove 'Packaging' flag from builds which aren't used in packaging side:
- vxworks build on linux
- msvc2019 builds

Change-Id: I8b56d4f087c59a4e841d3789d1c3acff5fdb7b09
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-05-15 14:48:34 +03:00
Tero Heikkinen
3ac3b7d9f3 Provisioning: Add Windows 11 on ARM as non-blocking in CI
Visual Studio 2022 is the first msvc having natively support for
building and debugging ARM64 apps. [CI Platforms]

Provisioning needed to take new Get-CpuArchitecture
helpers.ps1 function into use in several installations.

Requirements for other branches
- Get-CpuArchitecture helpers.ps1 function
- Skip qtwebengine with Windows 11 ARM (QTBUG-124632)

List of excluded installations in Windows on ARM:

- Could be added later
  - MinGW - QTQAINFRA-6079
  - DirectX SDK for RTA
  - libclang
  - mcuexpresso
  - fbx for msvc2022
  - Ruby
  - For python
    - conan
    - emsdk

- Not supported yet
  - FFmpeg
  - Msys2 (for FFmpeg QTBUG-124399)
  - MySQL
  - PostgreSQL
  - Java JDK
  - Strawberry Perl

Task-number: QTQAINFRA-6109
Task-number: QTQAINFRA-5855
Pick-to: 6.7
Change-Id: I4130e78add53f8a6e05eb41b7617b3f9ca802178
Reviewed-by: Simo Fält <simo.falt@qt.io>
2024-05-14 19:47:28 +03:00
Tero Heikkinen
9eae314404 Provisioning: Add Ubuntu 24.04 ARM64 as non-blocking in CI
Documentation targets moved to nightly - QTBUG-125212 [CI Platforms]

Ubuntu 24.04 has gcc 13.2.0 .

Task-number: QTQAINFRA-6112
Task-number: QTQAINFRA-6098
Task-number: QTQAINFRA-6203
Change-Id: I2f7d24ed13f6a318d738e9cd2f607e928c6bb8a2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2024-05-10 11:41:52 +00:00
Simo Fält
e34e62b3b2 Provisioning: Install openssl3 into Debian VM
Task-number: QTBUG-123049
Change-Id: Ia4bacf1b7751e15915fc7faca473cb0408a72e35
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-04-25 14:59:43 +02:00
Elias Toivola
86c53b6cce Update MySQL and enable it for more Windows targets
Currently MySQL is enabled only for Windows 10 22h2 msvc2022 and it
uses deprecated MySQL Connector/C. This change updates MySQL client
library by replacing MySQL Connector/C with MySQL 8.0 Server package
which contains a newer client library that works in other
Windows targets.

This change also enables MySQL in other non-packaging
Windows 10/11 targets except ARM, as Windows on ARM still
lacks MySQL support.

Task-number: QTQAINFRA-4999
Fixes: QTBUG-106097
Change-Id: I4472d3e441668bada18268fc4486bbbeefc4afd6
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2024-04-21 18:21:32 +03:00
Pavel Dubsky
befe4a61d6 Update provisioning script to build FFmpeg for Windows ARM64
Fixes: QTBUG-122745
Pick-to: 6.7 6.5
Change-Id: Ib03484ac89f07d7ad6433b0035769f4a9363495b
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
2024-04-20 08:37:10 +02:00
Elias Toivola
25f4cc5db6 Remove Windows 11 22H2 targets from CI
22H2 is replaced by Windows 11 23H2.

Task-number: QTQAINFRA-6113
Task-number: QTQAINFRA-6075
Change-Id: Ifd960a4c18b19f91a2624a23eacffa59c2faefac
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-04-16 20:51:37 +03:00
Elias Toivola
dc919e14d8 Make Windows 11 23H2 targets blocking
This change removes 'InsignificantTests' feature from Windows 11 23H2
platform configurations as there has not been increased test fail
rates compared to 22h2 targets in the past 10 days.

Also add 'Packaging' to windows-11_23H2-msvc2022 target

Task-number: QTQAINFRA-6113
Task-number: QTQAINFRA-6075
Task-number: QTBUG-124244
Change-Id: I8ddb9dfa45199982511f46841d1be30757055b25
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-04-16 20:51:35 +03:00
Alexey Edelev
63f83fb13d Add the explicit INPUT_headersclean=ON flag for non-qtbase repos
The 'headersclean' flag is not a "feature" anymore, so qtbase doesn't
propagate it for other repositories. CI no need to set either
INPUT_headersclean=ON or add -headersclean flag to the
qt-configure-module script command line.

Task-number: QTBUG-121722
Change-Id: I6970d6a04dd51ad4d3df114212f6410b80ddc6a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2024-04-16 06:25:00 +02:00
Toni Saario
c06ac4d550 Move c++20 to msvc2022 on windows 11 23h2
Amends f22c8e459f

Change-Id: I328cd0fbe7b93c84903373224ebc8d230ea7f62f
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-04-02 15:45:17 +03:00
Elias Toivola
5157d1ef93 Add Windows 11 23H2 as non-blocking in CI
Windows 11 23H2 version which will replace Windows 11 22H2 once the new version is deemed as stable. Until then, 23h2 tests will be set as insignificant.

Task-number: QTQAINFRA-6075
Task-number: QTQAINFRA-6113
Change-Id: I15054813896210fadf14da815ad5a7b3e402e800
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-03-28 18:30:59 +02:00
Tero Heikkinen
272d49061e Provisioning: Update MSVC2022 in CI
Updated:
Visual Studio Professional 2022
Visual Studio Build Tools 2022
CL new version 19.39.33523

BackgroundDownloader.exe disabled to reduce CPU usage during idle.

Task-number: QTQAINFRA-6204
Task-number: QTQAINFRA-6190
Task-number: QTQAINFRA-6206
Change-Id: I25dfc393a4b320cbaddefda2c8ff4b1738a776d8
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2024-03-26 07:33:15 +02:00
Joerg Bornemann
c8a236e858 CI: Turn off FEATURE_clangcpp for MSVC2022
This feature turns off clang-support for lupdate.

Task-number: QTBUG-123611
Task-number: QTQAINFRA-6204
Change-Id: I192b711b6a310e3dd1da3fefe2ca0c8fb732a01c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2024-03-26 06:33:11 +01:00
Joerg Bornemann
f22c8e459f CI: Turn off C++20 for MSVC2019
qtbase/45fd36f1480a6229879a4e59236ffa1d1d22dfbf triggers internal
compiler errors in MSVC2019 when configuring Qt with -c++std c++20.

Move the build-testing of the C++20 standard to
windows-11_22h2-msvc2022.

Change-Id: I7591223ae391471c61a80883f305c73e43945714
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-03-18 12:47:34 +01:00
Liang Qi
23ce6f4378 Run tests on offscreen mode for debian arm
Debian arm only has Wayland, and there is no QtWayland QPA plugin
available yet during the integration of each module. We can run
offscreen mode for now. And enable tests on Wayland in qtwayland
and qt5 integration.

Pick-to: 6.7 6.6 6.5
Task-number: QTQAINFRA-5594
Change-Id: Ie06d0b88509f9e55c96ce3b05b18ff8cec672f6b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2024-03-18 11:30:54 +01:00
Simo Fält
a3f2c30374 CI: Use '-qt-doubleconversion' with Debian config
This is to avoid additional dependencies.

Fixes: QTBUG-123051
Pick-to: 6.7
Change-Id: Idb6937e9df353f1667eabedb2642a766131d02da
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 3bbe6f0250)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-03-08 01:08:10 +00:00
Simo Fält
859b4e0c8c CI: Restore lost variable for skipping Debian instructions
Change-Id: I6e0cbb9f974bbe305682afffdfece810307225e6
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-03-01 08:53:10 +02:00
Simo Fält
54245a4888 COIN: Update used chroot for Debian packages
Use Ubuntu 22.04 instead of 20.04

Pick-to: 6.7
Change-Id: If03ba14555fdcd0c98fab3843bdfd5c2ca1eba3f
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-02-28 05:24:10 +00:00
Simo Fält
b67103423c COIN: Disable Debian config from modules missing rules
Task-number: QTBUG-122447
Pick-to: 6.6 6.7
Change-Id: I6e893d07e30bd246b78559dd439fbaff452468e9
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-02-21 13:28:01 +00:00
Simo Fält
2df41ae02b COIN: Update branch in Debian rules repositories
Change-Id: Ic4ed1e04c94223b533c63f59133af0befc26dd5c
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-02-14 09:49:23 +02:00
Timur Pocheptsov
65695bc38b QtMultimedia - build ffmpeg plugin for iOS
Minimal preliminary script for building ffmpeg for iOS.

Change-Id: Ie210db8cd50b5a757fcc6d6258c3ebdf4fc53c51
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
2024-02-03 08:40:15 +00:00
Artem Dyomin
0fe99775c0 Enable ffmpeg shared libs shipping for Windows targets
We have to replace static linkage with dynamic one due to
licensing issues.

The related patch in QtMM
codereview.qt-project.org/c/qt/qtmultimedia/+/523405
introduces cmake var QT_DEPLOY_FFMPEG that enables deployment
of ffmpeg shared libs to the installation lib dir or
the build lib dir (for dev builds).

These are build/tests results for the current CR
together with the patch in QtMM
testresults.qt.io/coin/integration/qt/qtmultimedia/tasks/web_rescheduled_qt_qtmultimedia_1703082976669

The related patch
codereview.qt-project.org/c/qt/qtbase/+/525100
fixes the deployment tool on Windows.

The plan is to have the set of changes for Windows in
6.5.4, 6.6.2, 6.7.0.

It was agreed that we want to backport shared ffmpeg to 6.6 and 6.5.

Pick-to: 6.7 6.6 6.5
Change-Id: Ie4d8621a98fb93715c32e49c830bfd715ed0e8a5
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
2024-02-02 07:23:19 +00:00
Tero Heikkinen
b6829751d2 Fix OpenSUSE 15.5 with new re-created Tier1 image
Task-number: QTQAINFRA-6065
Pick-to: 6.7 6.6 6.5
Change-Id: I24530bcca2a8f8e50686703d8cd8519c27195de2
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2024-01-19 10:02:09 +02:00
Toni Saario
bf2b855daf Make vxworks target significant on all ported modules
Pick-to: 6.7
Change-Id: Ic9e6f0d5eddcfd242b935cc2d473df611cc32835
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2023-12-18 05:33:13 +00:00
Elias Toivola
0b70b8f3c4 Update MinGW to v13.1.0 (x86_64)
Task-number: QTQAINFRA-5045
Change-Id: Id63e375faf2ed984c461ff4eab6271187672c3ea
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-12-11 13:14:06 +02:00
Jani Heikkinen
370890a8e3 Add 'Packaging' flag for llvm MinGW build
We are planning to add llvm based mingw build in the online installer
from Qt 6.7.0 ->

Task-number: QTBUG-119386
Change-Id: I4603e1492e54b7b05e67e0f2f422cc668bf7d822
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2023-11-24 11:53:40 +00:00
Konrad Kujawa
9707535fc1 Add provisioning of gRPC on Windows machines
Enable native_grpc feature on msvc developer-builds.

Fixes: QTBUG-109072
Pick-to: 6.6
Change-Id: I64914d4bf0f26b907a98508f88587cbc8cb947b3
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
2023-11-22 20:06:49 +02:00
Toni Saario
92bdb686cc Add VxWorks target
Adds VxWorks VSB, VIP and libs. Exports VSB and work dir for
VxWorks qemu. Places VxWorks qemu launcher in home.

Use 8 cores on VxWorks target as qemu is run on 4 cores and
those 4 cores will be run at 100% all time due to RTOS nature
of VxWorks.

Task-number: COIN-297
Change-Id: If1ae42109a5a1ab7164f09a9eabf9fd9064fd0d9
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Jarno Lämsä <jarno.lamsa@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-11-14 21:18:20 +02:00
Jukka Jokiniva
cd06971dd3 Change Debian packaging rules branch for 6.7
Change-Id: Icdfa48c7e98a5f0e88a7d2e26f262aeaab12e709
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-11-09 17:07:31 +00:00
Tero Heikkinen
19cbccac87 Remove RHEL 8.6 from yaml configurations
Removing RHEL 8.6 from yaml configurations at first
and scripts will be kept for some time, until removed later.

Task-number: QTQAINFRA-5768
Change-Id: I687f96de35b4bfa28d5a520717f29f059c4925c3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2023-10-07 13:50:21 +03:00
Simo Fält
43d66408b0 COIN: Use Ubuntu Focal chroot instead of Debian stable
We need to use older chroot to build debian packages.

Task-number: QTBUG-117120
Change-Id: I044e398324c380716b309dad5b087e97bc6688ab
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 43e1a3d2f5)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-10-03 17:43:58 +00:00
Tero Heikkinen
ee054393ce Remove SLES 15 SP4 from CI platform configs
SLES 15 SP4 scripts from pre-provisioning and provisioning
will be removed later.

Pick-to: 6.6
Task-number: QTQAINFRA-5667
Change-Id: Idb49075800e5c3a23804b6df8dd283af3fcbf000
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-10-02 18:57:27 +03:00
Tero Heikkinen
fa1143e15b Remove InsignificantTests flags from SLES 15.5
SLES 15.5 is added as parallel with SLES 15.4 until packaging
site gives green light to remove the older version.

This is following the new CI process to introduce new platforms in
parallel with Insignificant flags in use. Flags removed now after
flakiness has been monitored enough to give green for OS replacing.

Pick-to: 6.6
Task-number: QTQAINFRA-5667
Change-Id: Icdb4ed3be8590f85c22c8b73ba6ff0543e2b6e09
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-09-28 10:59:26 +03:00
Marc Mutz
7db7d89fd0 ubuntu-22.04: don't ignore warnings anymore
We permanently accept C++17-isms that cause warnings (or, on Clang,
sometimes hard errors) in C++20 builds, because this configuration
(unlike the MSVC C++20 build) disables -Werror.

Enable -Werror for dev C++20 Linux builds, at least, going forward.

Change-Id: I2334f87e7c88f263af89bdd029bdf469f242d297
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2023-09-20 06:29:11 +00:00
Tero Heikkinen
f81b389059 Add SLES 15.5 to CI with InsignificantTests flag enabled
SLES 15.5 will be added as parallel with SLES 15.4 until
packaging site gives green light to remove the older version.

Upgrade nodejs to commonly used 18.16.0 version

This is following the new CI process to introduce new platforms in
parallel with Insignificant flags in use. Flags removed later after
flakiness has been monitored enough to give green for OS replacing.

Pick-to: 6.6
Task-number: QTQAINFRA-5667
Change-Id: I66d325f0e20f536b8e8b61ce3eb9f1dbc6a9f204
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2023-09-14 13:59:23 +03:00
Simo Fält
ddef5cc5f2 CI: Enable debian amd64 debian packaging config
Change-Id: I4efcdb930edb6b42e1042316986e5fb11ca337f6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 932419ebb9)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-09-12 07:33:27 +03:00
Tor Arne Vestbø
f161cc18e2 coin: Enable warnings are errors for iOS build
Change-Id: Iad787adb9d4a184d047815c3b16750444ce6b0e9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-09-02 13:58:19 +02:00
Simo Fält
8667829703 CI: Enable debian arm64 debian packaging config
Change-Id: I15537eab53c6e879d22761a12b017f3aaab4f7ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 00af6b857a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-09-02 11:58:14 +00:00
Tero Heikkinen
0122ea6e0a Replace OpenSUSE leap 15.4 with OpenSUSE leap 15.5
OpenSUSE 15.5 will replace 15.4 in yaml configurations
at first and OpenSUSE 15.4 scripts are still kept for some time.

OpenSUSE 15.4 scripts will be removed later.

Task-number: QTQAINFRA-5666
Change-Id: Ic04dee5935b2d0ea9b99dd103f796d38ea90ba2d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-08-29 09:56:43 +03:00
Tero Heikkinen
9ea71ea245 Upgrade RHEL 9.0 to version 9.2
RHEL 9.2 will replace RHEL 9.0 in yaml configurations
at first and RHEL 9.0 scripts are still kept for some time.

RHEL 9.0 scripts will be removed later.

Task-number: QTQAINFRA-5608
Change-Id: Iff463f26ba6bcb7962b4f8bafbf88aa7c13392c1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-22 14:00:24 +03:00
Simo Fält
ca17f43f26 Revert "COIN: Disable linux on arm config again"
This reverts commit 82327bfc4d.

Reason for revert: There are two hosts up and running

Change-Id: I388110f581e5040019448b410ea93747154e0efd
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-08-04 05:48:17 +00:00
Alexey Edelev
fc257d16aa Enable ProtobufWellKnownTypes build for iOS
Specify QT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR that points to the
host protobuf include directory, to grab the required .proto files.

Task-number: QTBUG-115582
Pick-to: 6.6
Change-Id: I4e8b3043b105b05799921ac9a943f414718c1d09
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-08-03 11:43:53 +02:00
Assam Boudjelthia
0da9d348cf Revert "Coin: temporarily set ubuntu-22.04-documentation targets insignificant"
This reverts commit c0cf9e7b28.

Reason for revert: Chromium update is done in qtwebenigne.

Change-Id: Ic8d9b0f5aadbaa8be3d89e08a770c5824a7a4da4
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-31 07:31:23 +00:00
Alexey Edelev
1cd7c2ab24 Use the correct NON_QTBASE_TARGET_CMAKE_ARGS for windows arm64 platform
Amends b028d7499f

Change-Id: I1b0ed42cbf7c738e6423f8af349bd906b5437e87
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-07-27 09:45:58 +02:00
Alexandru Croitor
3ed21fda1a CMake: Remove feature workarounds now that we ignore strawberry perl
Now that we ignore the libraries shipped within the strawberry perl
distribution, we can remove the explicit FEATURE_system_foo flags
because we'll default to using the qt provided libraries by default.

Pick-to: 6.5 6.6
Task-number: QTBUG-113726
Change-Id: I0ef7ae2afd489107a4d5b2c4f859e1e3590ca5e9
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-07-26 08:27:09 +02:00
Alexandru Croitor
9b7dcd94df CMake: Ignore libraries provided by strawberry perl
Because we have strawberry perl's bin dir in the PATH, CMake considers
that a find_package prefix, and thus finds includes and libraries
that are shipped with strawberry perl.
That causes problems because the 3rd party runtime libraries are not
installed by the Qt installer, so any Qt modules / plugins that depend
on the 3rd party libraries will fail to load.

Use CMake 3.23's CMAKE_IGNORE_PREFIX_PATH option to tell it to ignore
strawberry headers and libraries.

We need to repeat it both for qtbase and non-qtbase args, to ensure
the libraries are not picked up for all of Qt.

This is a more general fix for problems like the one fixed by
a97bdde4d4

Pick-to: 6.5 6.6
Task-number: QTBUG-113726
Change-Id: I706bf9ac945a47dc809bbb6eb9eda4ca93f84695
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-07-26 08:27:08 +02:00
Assam Boudjelthia
c0cf9e7b28 Coin: temporarily set ubuntu-22.04-documentation targets insignificant
... and the targets that depend on it, to deal with a cyclic dependency
in qtwebengine chromium update.

Change-Id: If5f64aed4d5e6ce34b8c6e58b3657fc3a438cb8c
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-07-25 12:53:04 +00: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