Commit Graph

5171 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
2cba97ff97 Update submodules on '6.4 in qt/qt5'
Change-Id: I2848f768b2e3639a34e7db360166eab9e5dd5ea3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-20 21:46:27 +00:00
Qt Submodule Update Bot
71ca50c6a4 Update submodules on '6.4 in qt/qt5'
Change-Id: I52af63b46a7a884f870a980aec274106e69374e5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-19 04:24:48 +00:00
Artem Dyomin
90b6629802 Update ffmpeg version to 5.1 for desktop platforms
Some issues have been fixed in ffmpeg 5.1, e.g, with videotoolbox.
So the update at least fixes our playback
of some video formats on macos, e.g. provided in the related bug.

After the update I tested the basic functionality on windows,
linux, macOS, and run CI tests, which are OK.

Task-number: QTBUG-98102
Change-Id: I72f45780e1c3983d6a1941db2b833b78784b90de
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 0f8eccdfc5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-18 12:48:15 +00:00
Qt Submodule Update Bot
bc1cbd7a4d Update submodules on '6.4 in qt/qt5'
Change-Id: I5d8f043a4cd7dfb588d0892ea58862a6e21af533
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-17 14:53:42 +00:00
Qt Submodule Update Bot
7d3f87b19f Update submodules on '6.4 in qt/qt5'
Change-Id: I7fe7db3a37fe8a2f4ff23b41d5c8ff3bacfb3b2f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-16 20:02:48 +00:00
Qt Submodule Update Bot
e9d40409c2 Update submodules on '6.4 in qt/qt5'
Change-Id: I8a2491baf78d293fa6e48d981bdf48eeabafcf87
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-13 20:06:00 +00:00
Samuel Mira
a20013290c Provision FFmpeg library for Android
Fixes: QTBUG-100474
Change-Id: I5cc6f645bd020628bc6a77d4a5d42575f4fcf979
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit f412e6f1d1)
2023-01-12 10:35:56 +02:00
Simo Fält
c3e721e544 Provisioning: Update default python3 version in win
Change amends 95e9f8da9a after new
version of win templates were introduced.

Change-Id: Idd370025201c66e3da5a3bde71573ad8461c4164
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit ab2ec09a76)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-10 06:09:56 +00:00
Qt Submodule Update Bot
2277eb6214 Update submodules on '6.4 in qt/qt5'
Change-Id: I59a1be0d5eb4032a444706ee66a7bba92f6a6707
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-10 02:27:09 +00:00
Qt Submodule Update Bot
be216fd910 Update submodules on '6.4 in qt/qt5'
Change-Id: I7d4584f997b181a045af36cd44c939fd7310bf54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-06 06:48:59 +00:00
Simo Fält
fe8ff09dec Enable QtMultimedia FFmpeg plugin build in packaging configs
Change-Id: I932baddbd940df945e07cdfcb298dc6095b45f69
Reviewed-by: Lars Knoll <lars.knoll@gmail.com>
(cherry picked from commit b794125ee9)
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-01-05 07:51:26 +00:00
Heikki Halmet
965086f2bc Change to use sha256 signed opengl32 mesa dll files
Task-number: QTBUG-108774
Change-Id: I7d2716aa23215b783365c293c968aeeef6626126
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 1fd2a26492)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-03 19:27:47 +00:00
Qt Submodule Update Bot
a38deb81a5 Update submodules on '6.4 in qt/qt5'
Change-Id: I34b2385cf70fb84ca8139664c8528abc46a25296
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-03 16:27:49 +00:00
Heikki Halmet
93f804ed73 Include platform dependency targets to android nightly yaml
Also update windows target to use latest windows version

Change-Id: If4e5568f4d138cba21296176e056757f59061bdb
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-01-02 11:48:47 +00:00
Simo Fält
e9b2c15201 Provisioning: Update default python3 version
Removing python3.6 and replacing it with more recent versions.

Change-Id: If8cd4c369e4fc9ff8dc7d53865b80b588f278091
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 95e9f8da9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-12-30 08:00:52 +00:00
Heikki Halmet
6e41cc70a0 Add Windows 11 22H2 to CI
Windows 11 21H2 will be replaced by 22H2 version

Task-number: QTQAINFRA-5203
Change-Id: Iad18055cf84d9c1ff38984611c820b1c23d663a2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit 3d05c67749)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-12-23 06:35:16 +00:00
Topi Reinio
04a8c2fe49 coin: Update provisioned qdoc, qtattributionsscanner binaries
Update qdoc to a version that queries system include paths from the
compiler, avoiding spurious documentation warnings in some environments.

Update qtattributionsscanner to a version that fails the documentation
build on incorrect input, i.e. incorrectly formatted qt_attribution.json
files.

Fixes: QTBUG-108353
Change-Id: I3a64f7810cddafcbf9de66bd1d848c18f5677ad0
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 31c4ad1686)
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2022-12-23 06:35:15 +00:00
Heikki Halmet
2db3661e56 Add Windows 10 22H2 to CI
Pre-installed to tier 1:
          MSVC 2022 17.3.6 plus build tools
	  MSVC 2019 16.11.20 plus build tools
          MSVC 2015 update 3 14.0.25420.1

Task-number: QTQAINFRA-5262
Change-Id: Ibcc2950dd7edef0d6aa92cef7e602a69da8498d9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit e9b3497c8e)
2022-12-23 06:35:13 +00:00
Luca Di Sera
56a8d5a74d Update QDoc libclang to 15.0.0
The `libclang_version` variable is now updated to the current version, 15.0.0,
in both "coin/provisioning/common/unix/libclang.sh" and
"coin/provisioning/common/windows/libclang.ps1".

The naming of the artifacts for the provided library was slightly
changed from previous versions.

Before, the version number would contain two integers separated by a
dot.
The generated artifact would be named after this version number, with
the dot removed.

That is, for example, for version 12.0, a release artifact would be
called "libclang-release_120.*".

The updated two version uses a three segments version number and,
furthermore, the artifacts name do not collapse the separating dots such
that a release artifact would be called "libclang-release_15.0.0.*".

To support the new naming scheme, some processing was removed from both
provisioning scripts.

For Windows, the line removing all dots from the `libclang_version`
variable was removed.

For Unix, the removal of the dots in the `libclang_version`
variable when expanding the variable to generate the target urls to
retrieve the artifact was removed, using the bare value of the variable
itself.

For Unix provisioning, the artifacts for some of the platform, namely
"CentOS" and "Ubuntu 22.04", are not provided anymore.

"CentOS" was replaced by "Rhel8.4" on "gcc10.0", hence the target url
for the redhat platform was modified based on the new name.

The "Ubuntu 22.04" artifacts were not provided, such that the platform
was removed.

The sha1 of the target artifacts on both provisioning script was updated
for all platforms.

Task-number: QTBUG-107199
Change-Id: I873680825b0953e897c610fb0b47f3cd90625646
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 487c92a3d0)
2022-12-23 06:35:12 +00:00
Qt Submodule Update Bot
9904e6f447 Update submodules on '6.4 in qt/qt5'
Change-Id: Id8c50841fc96dc56557b2e8e82e4d338cca46738
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-21 17:17:09 +00:00
Heikki Halmet
e24ac3b3ca Add Android NDK r25b to nightly run
Task-number: QTQAINFRA-4990
Change-Id: I002777b8add830e48c62d46ea8d885a9bc14ff83
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-12-21 06:09:03 +00:00
Qt Submodule Update Bot
6d046574d0 Update submodules on '6.4 in qt/qt5'
Change-Id: I201325ad08a472320a98aaa05431d8c741465802
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-05 08:24:42 +00:00
Qt Submodule Update Bot
8a5aec9b47 Update submodules on '6.4 in qt/qt5'
Change-Id: If417eebf2e4c43ef564308f3f30a9a7f2753d869
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-30 16:18:57 +00:00
Alexandru Croitor
6391aed52a CMake: Update provisioned CMake to version 3.24.2
Needed to fix iOS Xcode generator builds when using Xcode 14.
Otherwise compiler identification fails due to a code-signing error.
We hit it in our iOS MinimalStaticTests configuration.

 error: Cannot code sign because the target does not have an
        Info.plist file and one is not being generated
        automatically.
         (in target 'CompilerIdCXX' from project
         'CompilerIdCXX')

See https://gitlab.kitware.com/cmake/cmake/-/issues/23719

Amends eee152ca70

Fixes: QTQAINFRA-5044
Change-Id: Idabd78e6e28816a8fc4dd7e627de82f2c622c54e
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 6943f28b17)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-11-29 08:46:28 +00:00
Artem Dyomin
e0b122e42f Add diffutils to msys2
cmp command is used by ffmpeg ./configure

Change-Id: If80664d6c3318b7605c69d50e7606a1ec10840ea
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 817a6d07f8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-28 10:14:04 +00:00
Heikki Halmet
ef15c16528 Provisioning: Make bootstrap autostart run without terminal
Terminal in UI might cause issues with Autotest
This patch makes bootstrap-agent run in a background shell wrapper.

The wrapper waits 20secs for the VM's network to come up and exits
with an error if it doesn't.
After that it waits for 20secs for the context image to be mounted.
If no context image is mounted after that, it waits for one minute
and makes one mounting attempt, before launching bootstrap-agent with
or without context.

Task-number: COIN-966
Change-Id: I9a3e490325d1fd7c0583b6d5db5eb2023e042571
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit fae885e9c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-27 17:03:45 +00:00
Artem Dyomin
6239e88de2 Enable llvm-mingw ffmpeg windows build
- Added build of ffmpeg for llvm-mingw
- Improved build errors handling
- Refactoring: decompose script into a few functions

Build example:
https://testresults.qt.io/coin/integration/qt/qt5/tasks/web_qt_qt5_1668780311363
See tests for LLVM-x64, they passed

Change-Id: I59fe28ba6eb8e65ef5c4c3d08343ff72f349bd21
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 5ef8294f3f)
2022-11-25 10:26:17 +00:00
Qt Submodule Update Bot
bcbb51112f Update submodules on '6.4 in qt/qt5'
Change-Id: I41548ebaefca210688a5507cc1bbbdf15684729a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-25 08:08:17 +00:00
Qt Submodule Update Bot
923ae4e64f Update submodules on '6.4 in qt/qt5'
Change-Id: I67f84848ca761aaf5830f65b46693478e3afa584
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-22 12:49:03 +00:00
Qt Submodule Update Bot
730c290f53 Update submodules on '6.4 in qt/qt5'
Change-Id: I10d726d965b6af2d76b891bd153e75282416256a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-19 09:57:08 +00:00
Heikki Halmet
6e94f4eaf0 Provisioning: Update Xcode version to 14.1
Command line tools are also updated

Change-Id: Ic1d0882d395e014a4f33ed139c90800b3ba71cbf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 20c8f11006)
2022-11-18 19:01:19 +00:00
Simo Fält
240b203917 Provisioning: Disable application reopen after reboot
This is required with physical Mac machines.

Task-number: QTQAINFRA-5094
Change-Id: Ic1fad436d76d04e1dbce778f57bb69d8124548e7
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit c58560db14)
2022-11-18 19:01:19 +00:00
Ville-Pekka Karhu
a0c057c160 Add provisioning for ARM macOS 13 beta
Task-number: QTQAINFRA-5066
Change-Id: I0ff36bea066b51e086b10b817769ca3f22190201
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit c310e97097)
2022-11-18 19:01:19 +00:00
Artem Dyomin
4772efbe48 Fix ffmpeg build on windows CI
Ffmpeg was not compiled because of failed yasm installation
on msys2. The installation failed due to checking pgp signatures.
Current fix adds keys refreshing that fixes the problem (checked
on CI and on local machine)

Note, currently the ffmpeg build works with msvc and mingw,
additional settings for llvm should be added in next commits.

Build example:
https://testresults.qt.io/coin/integration/qt/qtmultimedia/tasks/web_qt_qtmultimedia_1667916985085

Change-Id: Iff305e896bfb382c0c4030235cc2ad942cbbc002
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit bc5662c050)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-18 08:28:42 +00:00
Heikki Halmet
d473e0ef63 Provisioning: Remove MSVC 2019 build tools update
Running vsinstaller twice seems to cause problems. Second installation
get stuck and it can't be used again. Seems like somethin get corrupted.

Task-number: QTQAINFRA-5090
Change-Id: Ic638879ea2f70bc74c028bff24daceb50e98480d
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 2a7c08f591)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-17 15:44:41 +00:00
Tor Arne Vestbø
5f8c0b220c Make macOS 13 Apple Silicon test significant
Task-number: QTBUG-104210
Change-Id: Ib75931616718406d1dd8a2476f8566ef15257d4a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7db5511fe6)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-11-16 21:30:15 +00:00
Tor Arne Vestbø
610eb94b82 Add macOS 13 on Apple Silicon as insignificant platform (for now)
Task-number: QTBUG-104210
Change-Id: Ic9f6a1b0a93e762a643fb98d31d1a3b82bdd61ea
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 2586e0f3bd)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-11-15 12:33:35 +00:00
Qt Submodule Update Bot
9c8208de5f Update submodules on '6.4 in qt/qt5'
Change-Id: I9ffd16dcb68b7bb5d8c1b996c9609831c5611e74
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-12 04:56:44 +00:00
David Skoland
9fc871298c wasm: Add actual emscripten installation to path in coin
I'm not sure where the emscripten-$version came from, maybe that's
how it used to be? In any case, in the current version (3.1.x),
the installation folder is in upstream/emscripten, so add PATH
there to access all emscripten utils.

Change-Id: I648feae21bc5caecc3f0bf0a7d16238680a85590
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit 4a6f43ed8d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-09 06:53:59 +00:00
Heikki Halmet
43a8ea3bbd Add openSUSE LEAP 15.4 (KDE) to CI
Graphichs Platform: X11 (System default) in image with suffix 50
Graphics Platform: Wayland (Plasma (Wayland) in image with suffix 51

Task-number: QTQAINFRA-5049
Change-Id: If4b208bc12bd272c757aac61ffc9ef7a88df8f7c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 9c21dd75d2)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-11-05 11:52:04 +00:00
Jani Heikkinen
5f48df25c0 Qt6: Build wasm target binaries only once
Wasm will be built only in linux and those same binaries will be used also
in macOS and Windows.

Change-Id: If94098df624ab718491b9407c456d75ce7c7b117
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a4db1a62b8)
2022-11-03 11:29:59 +00:00
Heikki Halmet
fd4187cc09 Provisioning: Fix for checking the installed Android openssl version
Change-Id: I2b180772da0e16aa69c7044eacc9c8ee617c6217
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 1a91aa20ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-11-02 19:34:11 +00:00
Piotr Srebrny
2217500031 Build static FFmpeg library on macOS
This patch modifies linux/ffmpeg-install.sh to work also for macOS.
The FFmpeg libraries are installed under /usr/local both for Linux
and macOS.

Since macOS x64 does not have the lzma lib for arm64 architecture
installed by default, I disable this libraries for FFmpeg. This
only affects the TIFF image decoder that we do not use.

Added the execute permission to the ubuntu scripts.

Change-Id: Ib8623c6a9bcdd24c89045ede0494839fb9cd2ecc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 51c663d171)
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-11-02 16:52:29 +02:00
Piotr Srebrny
d7984542a2 Provision FFmpeg library for QtMultimedia plugin
One of the QtMultimedia backends is implemented using FFmpeg.
This provisioning enables building and testing of this backend.

Change-Id: Ia196c2ae4b457aa6b8e3ee8e0f367197aadfe0d9
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a273e9f11c)
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-11-02 16:52:27 +02:00
Qt Submodule Update Bot
f3a7ef45f9 Update submodules on '6.4 in qt/qt5'
Change-Id: Ied862aad99691d5fc0655e45c3d55ff2242f9043
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-02 00:23:59 +00:00
Heikki Halmet
a74ce90f2d Nightly builds: Add NON_QTBASE_TARGET_CMAKE_ARGS to qnx windows target
Other modules don't include needed flags

Change-Id: Id4525fa9887afff2ee6baed64f217167f545a2f5
Reviewed-by: Tommi Mänttäri <tommi.manttari@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c383d0fc91)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-11-01 08:31:11 +00:00
Tony Sarajärvi
9b15868ce5 Update LLVM MinGW to 15.0.0
Task-number: QTQAINFRA-5214
Change-Id: I5ae09182dfbafdeaa8d23acf3d7c9cca0ca5f108
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit da78e8832d)
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-30 19:15:10 +03:00
Qt Submodule Update Bot
97e64cd225 Update submodules on '6.4 in qt/qt5'
Change-Id: I8165809c56c7b5f3f86b835d48740c8fd9060024
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-26 17:28:42 +00:00
Teemu Holappa
b0a2759c5e Remove qmake configuration option from qtsaferenderer.yaml
qmake options is not supported in 6.4.

Change-Id: I421aebf8e67a19de4b9b6ae2b6addb5afaf004b7
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-10-21 17:40:43 +03:00
Paul Olav Tvete
5f588f7f5b Make qtmultimedia depend optionally on qtquick3d
Needed for spatialaudioquick3d.

Change-Id: I2bbfe1a23622deb90e7641b322ad9eac3ae4a112
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 64a715e8be)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-21 10:50:00 +00:00