Compare commits

...

388 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
90e86aee3d Update submodules on '6.7.3 in qt/qt5'
Change-Id: I36c94e8c693332f809f6b48b6e8e15ec0ec87316
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-20 02:39:02 +00:00
Qt Submodule Update Bot
d52f28de3e Update submodules on '6.7.3 in qt/qt5'
Change-Id: I8860b4be077ad939cef7c0c9bf0a6b67d9a19af8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-19 03:45:35 +00:00
Qt Submodule Update Bot
8f35a003fa Update submodules on '6.7.3 in qt/qt5'
Change-Id: I86a5d27e4436106cc110a1621047ccc5363b7d29
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-17 19:34:55 +00:00
Qt Submodule Update Bot
1511c648b1 Update submodules on '6.7.3 in qt/qt5'
Change-Id: Icc0c75be1166fde9f24f644e2e457e5b114ab43b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-13 18:52:44 +00:00
Qt Submodule Update Bot
eede45a3b6 Update submodules on '6.7.3 in qt/qt5'
Change-Id: I673595d1cf35121dddb31daa398a2d0af6555905
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-11 18:01:19 +00:00
Jani Heikkinen
49b311bfa3 Adjust submodule branches
Change-Id: I1b75c5d2e05c7ca5ea8bb296942d75725f772010
2024-09-09 06:37:02 +01:00
Qt Submodule Update Bot
7b1bc71682 Update submodules on '6.7 in qt/qt5'
Change-Id: I1bcbd36afa2146ebd91ae94e37b84416e7d692b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-06 18:36:13 +00:00
Elias Toivola
578a47e1b0 Revert "Provisioning: Add Windows 11 on ARM as non-blocking in CI"
This reverts commit 72f11e0952.

Reason for revert: WoA is not going be included in 6.7 and WoA target is blocking dd08ded0fc20f5fce10bf287d4d22ae026226717, -51 template will not work with the proxy enabled and -53 template brings error C2672 with its updated MSVC in 6.7 qtbase.

Task-number: QTQAINFRA-6111
Change-Id: I13fde01aba392b173db178bff6893b71c20ae98a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-09-06 09:34:51 +00:00
Tero Heikkinen
3a1f14f866 Windows: Enable proxy with fix to cert issue with Py 3.10+
Packaging reported issue that python installation
without proxy didn't work - therefore enabling proxy
back was needed but with a fix to handle Py 3.10+ changes

Py 3.10+ pip 24.2 has moved to use system certifications
by default which caused issue when proxy is used
and if host didn't have one specific certification
GlobalSign Root CA - R3 for pypi.org.

Also noticed that sometimes Windows x64 images seemed to
have this missing certification, but after installing it
to Windows ARM (which was clearly missing it) - logs showed
they didn't have it - and direct check to both Win x64
Tier1 images showed that they didn't have that cert.

Not sure what steps in provisioning or proxy usage could have
affected to that, but missing certification is now added directly
to all of these new three Windows Tier 1 images:
   - qtci-windows-10_22H2-x86_64-52 (via QTQAINFRA-6207)
   - qtci-windows-11_23H2-x86_64-53
   - qtci-windows-11_22H2-aarch64-53 (only to branches 6.8, 6.9)

Therefore --use-deprecated=legacy-certs flag is not needed
when system has correct certification available as Py 3.10+
has moved to use them by default.

Long-term improvements could still be added in future, in two ways:
   1) Internal package cache (QTQAINFRA-6485 QTQAINFRA-5531), or
   2) To update system certificates with Py 3.10+

But those will need more time to decide and implement.

Therefore this improved quick fix to get proxy back with Py 3.10+
was needed now and it removes previous quick fix to unset proxy.

Task-number: QTQAINFRA-6490
Task-number: QTQAINFRA-6473
Pick-to: 6.5 6.2
Change-Id: I0805a70cf1163012094505162d28640e9ea8e6bb
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 61c5bb072f)
(cherry picked from commit aa22a35f05)
2024-09-06 12:34:49 +03:00
Elias Toivola
e6369d29ff Windows-10_22h2-x86_64: Disable MS services that we do not use
qtci-windows-10_22H2-x86_64-51 was copied as -52

In this new tier-1 image, the following services were disabled:
  - backgroundDownload.exe (part of MSVC)
  - Microsoft Edge update/installer and Onedrive

Also missing certification GlobalSign Root CA - R3 was added.

Pick-to: 6.5 6.2
Task-number: QTQAINFRA-6207
Task-number: QTQAINFRA-6490
Task-number: QTQAINFRA-6473
Change-Id: Ifd51d25a6c8d43b008ca65af22ebbd592cf57b85
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d58045688b)
(cherry picked from commit 368369beb1)
2024-09-06 12:34:47 +03:00
Qt Submodule Update Bot
1f5980fc28 Update submodules on '6.7 in qt/qt5'
Change-Id: Iffa705062a2006877bf2f8cdbfe46012c1d4150b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-09-05 12:38:41 +00:00
Elias Toivola
645e113deb Provisioning: Add Java 17 to Windows on ARM
There are no WoA versions of JDK builds available from Oracle but
Microsoft maintains a WoA compatible OpenJDK build.

This change also removes the registry edit to disable Java
auto-update as the auto-update function in Java no longer exists.

Task-number: QTQAINFRA-6109
Task-number: QTQAINFRA-6385
Change-Id: I672ef4ac7cbca3d62ecd6a646fd769aff1cad4c5
(cherry picked from commit b3f5b4fd64)
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2024-09-03 12:46:39 +00:00
Tero Heikkinen
5790f56b34 Provisioning: Update Java on Windows x64 to 17
Java 17 for Android, needed by RTA

Task-number: QTQAINFRA-6385
Change-Id: I1200fc5fc4dfdac1faea6b262277aae525efc835
(cherry picked from commit 84bf41ba5b)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2024-09-03 12:46:37 +00:00
Qt Submodule Update Bot
8bf6ec3ec0 Update submodules on '6.7 in qt/qt5'
Change-Id: I6a90e14c3c4658e38511c6dfebd46f2fc54b52ed
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-28 06:38:32 +00:00
Qt Submodule Update Bot
4e234b035a Update submodules on '6.7 in qt/qt5'
Change-Id: I91b4b135e080fad5f79de1ce23d46d7a68b9635c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-26 17:05:04 +00:00
Qt Submodule Update Bot
3f3a161387 Update submodules on '6.7 in qt/qt5'
Change-Id: Iac7beba96ee5fc4efb94ed3a764ccec8792d92aa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-23 00:05:14 +00:00
Qt Submodule Update Bot
8d85addfae Update submodules on '6.7 in qt/qt5'
Change-Id: Ief1c91d7683b1d27856a9f4f87da129b445c2a8b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-21 10:14:25 +00:00
Tor Arne Vestbø
63479b87fa Provisioning: Remove mac certificates and signing tools
Those will be provided by Coin.

Follow-up to 4e09a6db79 for macOS ARM.

Pick-to: 6.5 6.2
Change-Id: Iffe433b606e6fb28580b8d2a265ee82f4bda7eb8
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 73c8e4d387)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 55bef8cb0c)
2024-08-21 00:12:36 +00:00
Pavel Dubsky
c77c2f629d Update FFmpeg version to n7.0.2
Task-number: QTBUG-127868
Pick-to: 6.5
Change-Id: I95f8f021cd23fdb35eb171d4609bf204878e105d
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit f2535cdcef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2007bdb634)
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
2024-08-20 16:27:09 +00:00
Alexandru Croitor
d387c64e8b coin: Explicitly provision the libzstd-dev package
It used to be installed as a dependency of some other package, but
stopped doing lately, which causes qtbase to build without zstd
support.

This change explicitly installs the libzstd-dev package to prevent
this from happening again.

Fixes: QTBUG-124787
Fixes: QTBUG-127644
Change-Id: I72793ed96ef39ec07244079c51efe17ae1f9af66
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 8ad05756ed)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit c3a5651bd0)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-08-16 11:24:09 +02:00
Qt Submodule Update Bot
23e6c7d563 Update submodules on '6.7 in qt/qt5'
Change-Id: Ifb4122affcaa090e86bedd519660ac8d208fd0bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-15 19:40:40 +00:00
Qt Submodule Update Bot
245ab3431f Update submodules on '6.7 in qt/qt5'
Change-Id: I2cf87b5e5bd99ce58266b9a94752d7cbed8fe6f5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-07 20:03:23 +00:00
Pavel Dubsky
826c313c1d Update FFmpeg version to n7.0.1
Fixes: QTBUG-126687
Pick-to: 6.5
Change-Id: I327a33a65aaa0285a93fa228f47d6914623f8d3d
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit a68d7302cd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 21a8e07fb3)
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
2024-08-07 06:30:13 +00:00
Tero Heikkinen
f621f59265 Python: Unset proxy for python pip cert issues
Task-number: QTQAINFRA-6473
Change-Id: I43cfd0cba3fcdcd7acdf1d75ee2347dac8b77175
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 31774f9103)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 09aa68b3de)
2024-08-06 04:21:42 +00:00
Qt Submodule Update Bot
6420235a69 Update submodules on '6.7 in qt/qt5'
Change-Id: I25590a3ed0159931c972fe7e321620afbd94a728
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-03 01:00:19 +00:00
Qt Submodule Update Bot
60439c8658 Update submodules on '6.7 in qt/qt5'
Change-Id: I18ade527f57596e0f7b71d7838ce2ee990fc6deb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-08-01 17:02:39 +00:00
Qt Submodule Update Bot
6dae2e4958 Update submodules on '6.7 in qt/qt5'
Change-Id: I82c2fbc4d9bd536e3b3fda4f4f7a94e33d4f49e5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-31 19:29:33 +00:00
Alexandru Croitor
5457dba661 coin: Fix pip3 installation on macOS arm
The pip3 install calls contained the word 'install' twice.

Starting with newer pip versions, this seems to fail with:

 /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install
   virtualenv wheel html5lib
 ERROR: Could not find a version that satisfies the requirement
   install (from versions: none)
 ERROR: No matching distribution found for install

Make sure install only appears once.

Pick-to: 6.8
Change-Id: I1bfc784d4e3d6a1c34d112e72e2739678d2f07ae
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 866b4cedaf)
2024-07-31 12:53:26 +03:00
Daniel Smith
0ee367f197 Update commit template for Reopens footer
Task-number: QTQAINFRA-6248
Pick-to: 6.5 6.2 5.15
Change-Id: Ie1b888a339eb62adc05e73a2307d4d23429c9aff
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
(cherry picked from commit 6a343fd319)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 44a2c39aa7)
2024-07-26 15:05:41 +00:00
Qt Submodule Update Bot
af09407705 Update submodules on '6.7 in qt/qt5'
Change-Id: I0454e828ca050e54f7ab85135216b119853f5884
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-26 02:07:28 +00:00
Qt Submodule Update Bot
b1c2553552 Update submodules on '6.7 in qt/qt5'
Change-Id: I6f9c80f3b5c95e620c0780c0417865592449e36d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-20 21:19:01 +00:00
Pavel Dubsky
32c928cd80 Use single installation archive for FFmpeg provisioning on all platforms
Fixes: QTBUG-125955
Pick-to: 6.5
Change-Id: Ibfa97e3d765eb3c4ff5613004bc881e49ddf10e9
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 49c03849e3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 66bcdbd0b3)
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
2024-07-15 16:36:02 +00:00
Tim Blechmann
f5692caec5 provisioning: install gstreamer plugins
This allows us to run unit tests that require real-world codecs on
debian/ubuntu

Pick-to: 6.5
Change-Id: I99a73506610ea430948692f8a88045394e747750
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 02af86d2aa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6eed0ab93a)
Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
2024-07-15 09:51:31 +08:00
Luca Di Sera
9d9634b9bb Update QDoc libclang to 17.0.6
The version variable that is used to define the packages to download was
updated to reflect the new version.

A new case was added for the new "Debian11" on "arm64" package which was
not a provisioned package on older version but is now provided.
As "Debian11" was not currenly loading "libclang.sh", a new script that
performs this process was added to
"coin/provisioning/qtci-linux-Debian-11.6-aarch64".

The newly sourced "libclang.sh" includes
"coin/provisiong/common/unix/common.sourced.sh", which sets up certain
common variables such as the used architecture and the platform id.
When "common.sourced.sh" sets "PROVISION_ARCH", that contains the
current platform architecture, it fails if the platform architecture is
not supported.

For "Debian11" on "arm64", the architecture, as reported by "uname -m"
is "aarch64", which is equivalent to "arm64".
"aarch64" was not handled by the script, so that a platform with that
architecture would result in a fail when sourcing "common.sourced.sh".

To avoid the failure, the case that sets "PROVISIONING_ARCH" to "arm64"
will not trigger when the reported architecture is "aarch64".

The specialized RedHat case was update to work specifically for version
9, to use the new specifically built package for Rhel9.2.

The default case, previously using an "ubuntu20.04" package, was
modified to use a "Rhel8.8" package.
A package for "Ubuntu20.04" is not currently provided anymore as the
platform was removed from CI and the new "22.04" package is not
compatible with all the platforms that would use it.

In particular, the new packages are built on a too new glibc, which will
then fail to link, due to undefined symbols in the produced Clang
libraries, when used on older-glibc platforms such as "OpenSuse15" and
"Rhel8.8".

The "Rhel8.8" package was specifically used as the platform for the
default package as it ships the older glibc, "2.28", of the supported
platforms, which should ensure that it works on the older-version platforms.

The "sha1" variables for cached downloads was updated to reflect the new
packages.

For provisioning on windows, the version variable and the sha1 variables
were updated to reflect the new version and the new packages, respectively.

Task-number: QTBUG-111580
Task-number: QTBUG-121548
Change-Id: Ie7c1a8d8fe9114912d53a87f70ebfa00341a9d8a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit 9975595a5e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1b97371ea0)
2024-07-14 14:47:33 +00:00
Qt Submodule Update Bot
1cf50b24b1 Update submodules on '6.7 in qt/qt5'
Change-Id: I4c6d06c02bc64b9446b0f98d8bf70d8eb22ea815
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-09 00:09:17 +00:00
Eike Ziller
73ea251e1a Qt Creator: Switch to ARM macOS 14
Used for packaging now, too.

Change-Id: I8b9edbff7abcc02a43011e078ec55ff195477dfa
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit 6120442e7c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 36cf1fd484)
2024-07-04 10:50:14 +02:00
Eike Ziller
5e15ff05c7 COIN: Fix sccache installation on ARM Macs
Install the ARM sccache binary to fix

/usr/local/sccache/sccache: Bad CPU type in executable

Change-Id: I033a7c8cf88d0d1ad35a4406a5d2a878da8d17a7
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c872c35cc6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 91c649c20e)
2024-07-02 06:23:47 +00:00
Marianne Yrjänä
053f02a0b9 QNX: Fix typos in QNX toolchain file
Fix CMAKE_SYSTEM_PROCESSOR definition for armv7le. This is needed when
using Windows host to cross-compile Qt binaries for QNX.

Fixes: QTBUG-125450
Pick-to: 6.5
Change-Id: I19df2ef9d4cc988f5acf4f09fa46b7014fac80d2
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 9e560e22a4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f042009b4d)
2024-06-26 12:20:44 +00:00
Tero Heikkinen
a2c9f7706e Windows ARM: Disable OpenGL as not supported on WoA
Task-number: QTQAINFRA-6109
Task-number: QTBUG-126030
Fixes: QTBUG-125438
Fixes: QTBUG-125439
Fixes: QTBUG-125444
Fixes: QTBUG-125445
Change-Id: I05297b056bf1f39e6a77198a2244eedd05c1f963
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 0491900249)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9e6a8a0f9d)
2024-06-26 07:13:26 +00:00
Pavel Dubsky
176fee78a8 Add GetVsInstallationPath and GetVsProperty helper functions
Introduce GetVsProperty helper function that allows to retrieve Visual
Studio installation property by providing required component (optional).
It also offers the ability to choose which version of Visual Studio to
use (the oldest or the newest). Also add GetVsInstallationPath helper
function which is a handy shortcut to retrieve installation path
property.

Pick-to: 6.5
Change-Id: I90afca74db9a6f87b622c7fafec2243e085e89e0
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 71b10bfe48)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f956053d4c)
2024-06-26 07:13:26 +00:00
Eike Ziller
ea363a90cd COIN/QtCreator: Remove Windows 32bit configuration
It fails to provision, and we don't need it anymore

Change-Id: Ifa5446613d00cbc6fbe90fe93718387d86f67eac
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit e873c1e269)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit feb1c21223)
2024-06-26 07:13:25 +00:00
Pavel Dubsky
bc854ea729 Update FFmpeg version to n7.0
Fixes: QTBUG-124482
Pick-to: 6.5
Change-Id: I69727981344d935151f19148960c711b65cb2307
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit eb8bbfe971)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit d4046310f8)
Reviewed-by: Liang Qi <liang.qi@qt.io>
2024-06-25 22:11:41 +02:00
Qt Submodule Update Bot
1c5205fa0d Update submodules on '6.7 in qt/qt5'
Change-Id: I90dec8c5c680aa5eebcc6b7a4371cbfb1b0a97b6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-25 03:05:20 +00:00
Qt Submodule Update Bot
ccff95d19f Update submodules on '6.7 in qt/qt5'
Change-Id: I286394323bd6e445c985b5f6e50c54b8a9c5b4c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-21 18:24:32 +00:00
Qt Submodule Update Bot
2b3beb825d Update submodules on '6.7 in qt/qt5'
Change-Id: Icf4569d5e0eadaa3aaff0c2b181c606d71f50bdc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-20 20:13:47 +00:00
Qt Submodule Update Bot
d076c4a223 Update submodules on '6.7 in qt/qt5'
Change-Id: Id3082857a56d66f711c550e8eb1b93dd2663dcfb
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2024-06-17 12:45:16 +03:00
Jani Heikkinen
22c3205a62 Add packaging flag for windows on arm config for Qt 6.7
Change-Id: I7a288f66ea23e923b87baf0266cb577223acd433
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Aku Pietikäinen <aku.pietikainen@qt.io>
2024-06-06 11:26:52 +03:00
Jani Heikkinen
94456b0224 Drop unnecessary, duplicate builds from '6.7'
- We don't need to duplicate msvc2019 packaging build to windows 11;
it is already done and packaged from Windows 10 ->
drop windows-11_22h2-msvc2019, windows-11_23H2-msvc2019

- We have windows-11_23h2-msvc2022 and so on we don't need
windows-10_22h2-msvc2022 or windows-11_22h2-msvc2022

- We have windows-10_22h2-msvc2019-developer-build and so on we don't need windows-11_23h2-msvc2019-developer-build or windows-11_22h2-msvc2019-developer-build

- We have windows-10_22h2-msvc2019-arm64, which is used as a packaging target so we don't need windows-11_22h2-msvc2019-arm64 or windows-11_23H2-msvc2019-arm64

- We have windows-11_23h2-llvm, which is a packaging target so we don't need windows-10_22h2-llvm or windows-11_22h2-llvm

- We have windows-11_23H2-mingw11-developer-build and so on we don't need windows-10_22h2-mingw11-developer-build or windows-11_22h2-mingw11-developer-build

Change-Id: Ic406288fa989b1cb8d90c0d502dd93c166c2af14
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-06-06 08:26:46 +00:00
Qt Submodule Update Bot
6fb6701e49 Update submodules on '6.7 in qt/qt5'
Change-Id: I3d7d8d6aec35b1cdbd2c53fb9912ebaf5d8470be
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-03 16:52:23 +00:00
Qt Submodule Update Bot
c679d198f8 Update submodules on '6.7 in qt/qt5'
Change-Id: I83e96e1e57700da990fad376166a1f82b45e2998
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-01 03:23:08 +00:00
Qt Submodule Update Bot
57b34af69f Update submodules on '6.7 in qt/qt5'
Change-Id: I5c6c8da521e50ae0e92ff0e3a3ae89967fdddab5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-30 01:54:37 +00:00
Tero Heikkinen
72f11e0952 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.

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-6111
Task-number: QTQAINFRA-6109
Task-number: QTQAINFRA-5855
Change-Id: I4130e78add53f8a6e05eb41b7617b3f9ca802178
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2024-05-29 12:40:59 +03:00
Oliver Wolff
0ef7ffd4ac Provisioning: Add Get-CpuArchitecture helper function
For the addition of ARM64 to our checked packages, this helper function
will come in handy as it is more fine grained than Is64BitHost.

Change-Id: I8956c1ca6e445c0b783a39e4d42069199496f053
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 8fae627f8b)
2024-05-29 12:40:56 +03:00
Qt Submodule Update Bot
d0a6a16338 Update submodules on '6.7 in qt/qt5'
Change-Id: I1b76a990ccd32230381a1c705ce1df00978f4512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-27 03:16:42 +00:00
Eike Ziller
dd98a76d21 COIN/QtCreator: Remove Qt5 configuration
This isn't supported for a longer time now.

Pick-to: 6.6
Change-Id: Id10fb6c73459e5f10f854b417af6b14eec2e0f78
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit 7bc8bfbf18)
2024-05-23 15:16:46 +02:00
Eike Ziller
c618f27a1a COIN/QtCreator: Add configuration for Windows without tests
Windows is most picky wrt exporting/symbol resolution,
so it is a good platform to do a build check without tests.

Pick-to: 6.6
Change-Id: I477e20f8c8bf16e1206082ae0c2b3960c902989a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit dec2de7b82)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-23 12:30:03 +00:00
Marianne Yrjänä
e1e4227f0a Update QNX7.1 toolchain for CI
Pick-to: 6.5 6.2
Change-Id: I807fbfd468331a08b0672c4b2f02da1208470bf1
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 319cbd99c8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-22 13:33:32 +00:00
Qt Submodule Update Bot
3f00f38287 Update submodules on '6.7 in qt/qt5'
Change-Id: I7a901d003ad2afb6603f657c0562beae49ffe9ff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-22 01:39:34 +00:00
Assam Boudjelthia
726e30183e Coin: update jdk from 11 to 17 to support Android builds with Gradle 8+
Gradle 8 and AGP 8+ require JDK version 17 to work properly, this is
needed for CI test runs of Android.

Task-number: QTBUG-106907
Change-Id: I437ee6752fe12ce4d40fbfe1af2bfff1b4ca243b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 31d72b0e2c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-21 07:56:53 +00:00
Tero Heikkinen
5a11af1085 Provisioning: Remove Python2 from Windows provisioning
Python2 certificate failure blocks Windows provisioning.

Task-number: QTQAINFRA-6315
Pick-to: 6.5 6.2 5.15
Change-Id: I6f1e273d30e60fc4cbe872cdae2e52330bdb1ac7
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2024-05-20 07:27:28 +03:00
Heikki Halmet
e621d289ae Rhel 9.2 provisioning: Install xcb-util-cursor before updating repos
Task-number: QTQAINFRA-6325
Change-Id: I88b2dda373f3a85bdc10cb79576efc733460b4aa
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit ae82c1ab18)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-19 13:22:37 +00:00
Qt Submodule Update Bot
9de295cd89 Update submodules on '6.7 in qt/qt5'
Change-Id: Ieb15e9aee48f995fedca44133097a3e6034ea1aa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-15 05:27:40 +00:00
Dimitrios Apostolou
244e9bb4df Copy mdns resolution workaround to the emulated platforms too
Applies fix from commit 5c6814fb18
to the emulated platforms.

Fixes: QTBUG-107696
Pick-to: 6.5
Change-Id: I9c282ecf9c29c57cce964ae9962f1857c953cfd8
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit d25f25f3af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-10 07:42:36 +00:00
Dimitrios Apostolou
a080533c2a Simplify command invocation
No need to wrap the sed call in a shell, just invoke sed directly.
And reduce the two separate sed invocations to one with two file arguments.

This change is purely aesthetic, functionality should be identical.

Pick-to: 6.5
Change-Id: If841301077e1c21fe846b28b5f7f6af422d86b93
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 5f3586f59f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-05-10 07:42:29 +00:00
Alexey Edelev
a5533df262 Fix the typo in list(APPEND command
Amends 13a7e25f5d

Change-Id: I52f0990c1b956a8a1c9315e02114e429548bd2d2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b1a9c94a19)
2024-05-08 11:25:42 +02:00
Alexey Edelev
aec2d4e2e1 Avoid collecting dependencies from modules that were explicitly skipped
If either -skip <module> or BUILD_<module>=OFF is set from command line
we should avoid processing the module dependencies and exclude it from
the list of modules that needs to be build.

Change-Id: Ieec8db085221cc4abd5d8ac83c06ecce25d5d4b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 13a7e25f5d)
2024-05-08 11:25:39 +02:00
Qt Submodule Update Bot
ea47cf9278 Update submodules on '6.7 in qt/qt5'
Change-Id: Ib8c65b8768d017fe47cf2250c7f4f3e46672499d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-06 16:09:56 +00:00
Qt Submodule Update Bot
08e5f2bf12 Update submodules on '6.7 in qt/qt5'
Change-Id: I6c95e4ed8091dba8e96af81e9507b014bc4bca14
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-03 17:16:24 +00:00
Qt Submodule Update Bot
33931ac1fc Update submodules on '6.7 in qt/qt5'
Change-Id: I2bbb4bfc2fd635abf1672693b9a425779bb9e10a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-02 17:15:50 +00:00
Qt Submodule Update Bot
a0ec00aae4 Update submodules on '6.7 in qt/qt5'
Change-Id: I3f10f3869d3372dec5b6643bce1e3b1cf0b4ead0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-01 12:40:22 +00:00
Qt Submodule Update Bot
4f5e24a5f3 Update submodules on '6.7 in qt/qt5'
Change-Id: I9dee1d860e9cf45e606d889b5ed3687ddeaf9df9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-30 15:37:34 +00:00
Simo Fält
90937a8406 Provisioning: Fix openssl lib path on Debian
This amends change Ia4bacf1b7751e15915fc7faca473cb0408a72e35.

Task-number: QTBUG-123049
Change-Id: I0a3e24dd8157fd63c1bdfb06019faff2fa5ef3df
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 2ac1bddea4)
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit e6f58ce000)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-30 07:30:25 +03:00
Simo Fält
5c06f6e262 Provisioning: Install openssl3 into Debian VM
Task-number: QTBUG-123049
Change-Id: Ia4bacf1b7751e15915fc7faca473cb0408a72e35
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit e34e62b3b2)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-04-30 07:30:22 +03:00
Qt Submodule Update Bot
66b3871d19 Update submodules on '6.7 in qt/qt5'
Change-Id: I8afbbf89469fb26b69a86a1fd1f563bdca5a6c05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-29 18:07:12 +00:00
Qt Submodule Update Bot
898bb43ce2 Update submodules on '6.7 in qt/qt5'
Change-Id: I5f49dc724c712b065810f030392cc93613e7e77e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-26 12:47:46 +00:00
Joerg Bornemann
419dac87ec CI: Turn off FEATURE_clangcpp for MSVC2022
This feature turns off clang-support for lupdate.

Task-number: QTBUG-123611
Task-number: QTQAINFRA-6244
Change-Id: I192b711b6a310e3dd1da3fefe2ca0c8fb732a01c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit c8a236e858)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-04-26 12:47:44 +00:00
Elias Toivola
2d591bf518 Make Windows 11 23H2 targets blocking
This change removes 'InsignificantTests' feature from Windows 11 23H2
platform configurations.

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

Task-number: QTQAINFRA-6244
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>
(cherry picked from commit dc919e14d8)
2024-04-26 12:47:41 +00:00
Elias Toivola
59cb56a8b5 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-6244
Change-Id: I15054813896210fadf14da815ad5a7b3e402e800
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 5157d1ef93)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-04-26 12:47:40 +00:00
Assam Boudjelthia
be3345b87e Coin:Android: bump minimum CI test emulator to Android 8 api 26
Qt 6.7 has the minimum supported Android version as 8, this applies
that to the CI as well.

Task-number: QTBUG-111919
Change-Id: Id4c9eda29f1b61bf739eae3624b07f44a893cfae
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 2d7f6760dd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-23 22:05:22 +00:00
Assam Boudjelthia
86fa22775f Android: remove unused Android 13 (api 33) system image download
Android 13 system image was still being downloaded and an emulator
created for it while it's not being used in CI, so it's just adds
unnecessary load to provisioning.

Change-Id: Ie33c82fd578dcfe68a77426c8e5c0cf047938833
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 3d69ad8d8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-23 22:05:19 +00:00
Qt Submodule Update Bot
2496b860e6 Update submodules on '6.7 in qt/qt5'
Change-Id: Id77e8e75361ad1684a1c869d2dea459c5e101738
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-23 08:24:02 +00:00
Pavel Dubsky
58db36e43c Update provisioning script to build FFmpeg for Windows ARM64
Fixes: QTBUG-122745
Pick-to: 6.5
Change-Id: Ib03484ac89f07d7ad6433b0035769f4a9363495b
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit befe4a61d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-21 19:01:32 +00:00
Tor Arne Vestbø
969309c09e Fix shellcheck warnings in set_tcc_permissions.sh
Change-Id: I6b4de6e02e92d4c85fbb58cb1573a0ab3a178b24
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 0a8f1050f9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-21 07:33:28 +00:00
Artem Dyomin
26a71457ae Implement dynamical ffmpeg linking on macOS
* fix dependencies and install names (absolute => relative)
* fix compilation build of dylib on xcode 15.
* add matching build instructions to yaml.
* old macos versions don't have 'realpath', workaround is used.

Task-number: QTBUG-120989
Pick-to: 6.6 6.5
Change-Id: I22e413d8f6d05c8c7d6d09a5926691216e781fd3
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit a53b63019f)
2024-04-20 08:39:40 +02:00
Assam Boudjelthia
82382f5c69 Android:Coin: do gradle build in provisioning to cache downloadables
If Gradle is not present in the system, it's downloaded from the URL
from the Gradle wrapper. Also, the same for AGP when an Android
project build is done. Currently, that's done on every integration,
and that can be unreliable due to networking flakiness. With this
patch, a Gradle build is done once during provisioning where the
downloads of Gradle and AGP dependencies are downloaded.

Fixes: QTQAINFRA-6166
Fixes: QTQAINFRA-4726
Fixes: QTBUG-117203
Fixes: QTBUG-114699
Change-Id: Ic9fd8aeea3379ca1d45ffeb4523a52e2846fcabb
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 39517ef0d0)
2024-04-18 06:51:03 +00:00
Qt Submodule Update Bot
2366d4f29e Update submodules on '6.7 in qt/qt5'
Change-Id: Ie7f6492a121a7624081839efeb5228b95adaa343
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-11 16:50:38 +00:00
Robert Löhning
76f10dbcc8 README.md: Update MinGW requirement
Change-Id: I931202f00592d5fc6411fa2d8a7825c5b9117c4e
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 6941e50a6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-08 16:44:34 +00:00
Allan Sandfeld Jensen
3d9ea708bf Add gbm dependencies for webengine to RHEL
Was previously only added for 8.4 and 9.0

Pick-to: 6.5
Change-Id: Ifa22b6836818ad59b6f3dcfd6b1a6dbc1293782b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit ee56a3b8ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-06 21:54:46 +00:00
Assam Boudjelthia
715e9f618d Coin:Android: update emulator version to 34.1.19
Update to latest (as of now) Android emulator version 34.1.19, which
might solve Vulkan crashes on some CI tests.

Pick-to: 6.6 6.5
Task-number: QTQAINFRA-5971
Change-Id: Ic81158f44ac5c922bfdbe6f5c04900234e063615
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit a9f16c0abd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-05 18:02:03 +00:00
Qt Submodule Update Bot
6b5bbaac15 Update submodules on '6.7 in qt/qt5'
Change-Id: Ie7e1e53c1b02727c7542f9f75d79ead0b3a3d133
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-05 00:49:30 +00:00
Qt Submodule Update Bot
fb9718eaa9 Update submodules on '6.7 in qt/qt5'
Change-Id: I839ae55ee8bae32b4429aece578f21ede4998bb3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-03 19:54:31 +00:00
Ville-Pekka Karhu
2d69082155 Platform configs: Replace hardware macOS 14 ARM with virtualized macOS 14 ARM
Task-number: QTQAINFRA-5831
Change-Id: Ibdd2360a55855d04bf02d6047870f48319c2ce9d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 9ceb1b5ef5)
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2024-04-03 08:11:28 +00:00
Tor Arne Vestbø
7c9b1a44d5 coin: Give bootstrap-agent permission to use microphone on macOS
The bootstrap-agent is the 'responsible process' in TCC terms when
it comes to whether a test should be allowed to access the microphone.

 https://www.qt.io/blog/the-curious-case-of-the-responsible-process

By giving this process the permission explicitly, by modifying the
TCC database, we ensure that all tests run as child processes also
get this permission.

Change-Id: Ia03084ac89f0717ac6457b0035769f4a9863495b
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit b4de4de742)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-04-02 15:06:33 +00:00
Ville-Pekka Karhu
71e8d16365 Platform configs: Add virtualized macOS 14 ARM tests as insignificant
Allows us to first see tart on production load before starting to
move the blocking arm targets to tart. Later configs will be
directly replaced and original ids will be used.

Change-Id: I865e6fe46b61828b6123b69973a2a4d209697c5f
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit dffc3dd7df)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-04-02 12:53:11 +00:00
Qt Submodule Update Bot
19c7154e11 Update submodules on '6.7 in qt/qt5'
Change-Id: Id45e21f2b705ffd925065c61d6aaa9704996828d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-28 22:31:17 +00:00
Qt Submodule Update Bot
30c9973910 Update submodules on '6.7 in qt/qt5'
Change-Id: Ic2ea2df5bb2617a02800a4b16fd10ec802742b2c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-28 08:07:34 +00:00
Simo Fält
1716158656 Provisioning: Disable keyring password prompt
Fixes: QTQAINFRA-6215
Pick-to: dev 6.6 6.5
Change-Id: I50e70177f763493107d0919625f4885dc3a9713d
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-03-25 14:17:19 +02:00
Qt Submodule Update Bot
bda0fd8aca Update submodules on '6.7 in qt/qt5'
Change-Id: I4f61262ed5dbd2f4d4b66fb21cb09883b4ba5ced
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-22 15:58:54 +00:00
Tero Heikkinen
c014692f7d Provisioning: Add vulkan package to SLES 15 SP5 for RTA usage
Task-number: QTQAINFRA-5969
Task-number: QTBUG-115722
Pick-to: 6.6
Change-Id: I16bedf931ea09b7dc5589ec2f465952ea66b73ca
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit f7702f8e42)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-03-22 14:38:09 +00:00
Qt Submodule Update Bot
03c4798676 Update submodules on '6.7 in qt/qt5'
Change-Id: I2cfe6548c178648b82b2a49f95cb3049421f7ea6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-21 05:27:23 +00:00
Tero Heikkinen
b1a5988c2c Provisioning: Make RHEL versions static
With new CI policy to always update packages when provisioning changes,
but system & packages are tied to a specific RHEL release i.e. --set=9.2

This could reduce unwanted upgrades and make provisioning more stable.

Task-number: QTQAINFRA-5658
Change-Id: I898a793acf152ebb6e1f31c9b26a98f47145bd5a
(cherry picked from commit e6d06a6f92)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2024-03-18 14:30:46 +02:00
Liang Qi
f78195fc93 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.6 6.5
Task-number: QTQAINFRA-5594
Change-Id: Ie06d0b88509f9e55c96ce3b05b18ff8cec672f6b
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit 23ce6f4378)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-03-18 11:47:39 +00:00
Ville-Pekka Karhu
418c431bb4 Provisioning: Add Spotlight disabling to macOS 13 and 14 ARM
Change-Id: Ibdb5d7d23d43b442811e4a47096b1038fcff3b27
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 25bc8c0ba9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-03-15 17:29:59 +00:00
Jukka Jokiniva
2c302c2431 Revert "Make Integrity temporarily non-blocking in CI"
This reverts commit d532c4d941.

Reason for revert: Integrity tool chain licenses fixed.

Change-Id: Ib32b7d30854e784806c11367dcac2d187b14eb8a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-03-12 13:19:01 +00:00
Simo Fält
ea89c8161f CI: Use '-qt-doubleconversion' with Debian config
This is to avoid additional dependencies.

Fixes: QTBUG-123051
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>
(cherry picked from commit a3f2c30374)
2024-03-08 09:45:17 +00:00
Qt Submodule Update Bot
1bfb20fddd Update submodules on '6.7 in qt/qt5'
Change-Id: I1c4eccbc5ce5bb1e090604c21627fed76c9087d3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-05 22:11:33 +00:00
Qt Submodule Update Bot
1b1df0bd22 Update submodules on '6.7 in qt/qt5'
Change-Id: Ic68f276fc2cc79189e50fb3c29a5fdcfd3e71251
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-03 21:22:55 +00:00
Qt Submodule Update Bot
64de8fa3ce Update submodules on '6.7 in qt/qt5'
Change-Id: Ia4dfd664d87dd77c8f4002559040ede5d7aefe7a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-03-02 02:27:18 +00:00
Jøger Hansegård
cabe404c4a Upgrade to msys2 20240113 in Windows provisioning
This upgrade is needed because msys2 20220319 fails to install
diffutils. Its url is broken. Diffutils was first added on 6.5

Fixes: QTBUG-122465
Pick-to: 6.6 6.5
Change-Id: If94cafed68f3400557e01365e743155e9b732dac
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 04910ff946)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-03-01 04:33:22 +00:00
Simo Fält
9e9dbeafa4 COIN: Update used chroot for Debian packages
Use Ubuntu 22.04 instead of 20.04

Change-Id: If03ba14555fdcd0c98fab3843bdfd5c2ca1eba3f
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 54245a4888)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-03-01 04:33:13 +00:00
Simo Fält
ee0409138b Provisioning: Fix re-installing ca-certificates on Debian
If the installed ca-certificates on tier1 is something that doesn't
exist in the repo anymore, re-install will fail. So just try to install
and expect update if a more recent version is available.

Change-Id: Ib6e610f4908fcae6af7e79ecc37ffe600c6ee7af
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c6d5521c45)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-29 16:18:57 +00:00
Michael Brüning
c582745a66 Use SetEnvVar instead of appending .bash_profile with LLVM variables
It seems that the existence of .bash_profile on Debian systems prevents
the .profile file from being read on login, which means some additions
to PATH that are essential for e.g. the Web Engine build are not made.

Change-Id: Ib271ef49e573fc0588ffbaa9bebbfda4469b60f9
Reviewed-by: Simo Fält <simo.falt@qt.io>
2024-02-29 16:18:52 +00:00
Qt Submodule Update Bot
7c1e6971aa Update submodules on '6.7 in qt/qt5'
Change-Id: I9e5f073964579a32fb6a4becbb6fbf54482671b7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-28 23:17:06 +00:00
Lorn Potter
dc2d69e3f0 wasm: update Emscripten to 3.1.50
Change-Id: I39f3dbfce016a95a5c88b11596e666791c2311af
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
(cherry picked from commit f0f3e42bf5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-27 21:01:39 +00:00
Qt Submodule Update Bot
030478671c Update submodules on '6.7 in qt/qt5'
Change-Id: I535b734e516d0d9f92efc74a36b0a2b5143c358c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-27 02:47:45 +00:00
Artem Dyomin
708ffa68a7 Update ffmpeg: explicitly refer to the latest release 6.1.1
Pick-to: 6.6 6.5
Change-Id: I231c5cdc6155de0d1ea98220a90ecc0f910b34d6
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 45220efb3a)
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
2024-02-23 07:51:58 +00:00
Simo Fält
c71b6a5343 COIN: Disable Debian config from modules missing rules
Task-number: QTBUG-122447
Pick-to: 6.6
Change-Id: I6e893d07e30bd246b78559dd439fbaff452468e9
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit b67103423c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-22 07:03:23 +00:00
Qt Submodule Update Bot
a607c4c58d Update submodules on '6.7 in qt/qt5'
Change-Id: I7644b20d7417c78d64258bb6b105f96f843e72e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-22 04:10:29 +00:00
Qt Submodule Update Bot
6eb72bddd5 Update submodules on '6.7 in qt/qt5'
Change-Id: I17670d4c23a86bf8e957f7dd0f1c3b2d94e34a14
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-20 14:50:32 +00:00
Topi Reinio
142ffbd208 coin: Update provisioned qdoc, qtattributionsscanner binaries
Update qdoc and qtattributionsscanner to the latest versions from
qttools/dev.

The qdoc binary is now built against libClang v17.0.1. It also supports
the new \compares and \compareswith commands introduced in Qt 6.7.

Task-number: QTBUG-111580
Change-Id: I7d91226a89870968ecf3c9938ffcb451b1ea5c68
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
(cherry picked from commit 0ac7878a57)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-19 15:56:18 +00:00
Artem Dyomin
37aed11625 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.6 6.5
Change-Id: Ie4d8621a98fb93715c32e49c830bfd715ed0e8a5
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 0fe99775c0)
2024-02-18 14:45:21 +00:00
Artem Dyomin
82db8fadea Update ffmpeg 6.0 => 6.1 for android targets on unix hosts
In n6.1, the target cpu is supposed to be x86-64 instead of x86_64.

Task-number: QTBUG-121343
Pick-to: 6.6 6.5
Change-Id: Id87a6eaaf73f093bbac66f245998cda6a3e992fc
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 85c2ab668b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-18 14:44:22 +00:00
Qt Submodule Update Bot
3a9a48d165 Update submodules on '6.7 in qt/qt5'
Change-Id: Ib1e0a5be6121131d69647567f8600a0ec2ff5248
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-16 11:17:15 +00:00
Artem Dyomin
0abefd8bba Retain symlinks upon making universal macOS binaries
Saving symlinks is important when we build dynamic libs,
it will be needed for building QtMM + dynamic ffmpeg.

Task-number: QTBUG-120989
Pick-to: 6.6 6.5
Change-Id: I58c040a81f1fa6a3b316ace864fda0687415fd0a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 231d089553)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-14 09:19:46 +00:00
Simo Fält
a92bc9040a Provisioning: Install libclang on Debian 11 template
Task-number: QTBUG-120912
Change-Id: I12e71c5c3058756e3e0eac420fb19a1f752b64b7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 5c4e8c7a64)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-14 09:19:43 +00:00
Dimitrios Apostolou
358a5f58e2 Enable automatic gdb stacktrace in QTest, in case a test crashes
On Linux, this requires that gdb can be found in PATH, and that no
kernel security settings like yama.ptrace_scope  prevent it.

Patch contains also a drive-by architecture detection fix for Debian arm64.

Fixes: QTQAINFRA-6029
Fixes: QTQAINFRA-5940
Fixes: QTQAINFRA-6030
Fixes: QTQAINFRA-6046
Fixes: QTQAINFRA-6012
Fixes: QTQAINFRA-5930
Task-number: QTQAINFRA-5933
Change-Id: Ie6debde94c1cc5783161ffa7354b58734c372702
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit c66f8407a8)
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2024-02-14 09:19:41 +00:00
Alexey Edelev
014ef281e4 Add libprotoc libprotobuf and libgrpc to Debian aarch64 provisioning
Use the system libraries.

Pick-to: 6.6 6.5
Task-number: QTBUG-121579
Change-Id: I15e0199a8aa41f607af43569a685cced3b522aec
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
(cherry picked from commit 7b104e18f8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-12 20:13:31 +00:00
Qt Submodule Update Bot
045c72d4eb Update submodules on '6.7 in qt/qt5'
Change-Id: I54f052c9c0bbd91d49d0524392cfc2ef94c66b0d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-12 07:25:50 +00:00
Artem Dyomin
f84d0c1644 Update ffmpeg to n6.1 for Linux and macOS
FFmpeg version was between n6.0 and n6.1 due to some hot fix
for having it compilable on CI. Since n6.1 has been release,
we should update.

Pick-to: 6.6 6.5
Change-Id: I0d88599be53748eeb038287abe8aad6c0f189933
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 9fa918c129)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-10 08:21:26 +00:00
Artem Dyomin
1cf5b24dc2 Update ffmpeg n6.0 -> n6.1 on Windows
The update will go tohether with dynamic ffmpeg build on Windows.

Pick-to: 6.6 6.5
Change-Id: I7a72d4009c8a8e4030899b526bad9cfedd6f45a7
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 483694d725)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-10 08:21:15 +00:00
Qt Submodule Update Bot
2a6f3f9168 Update submodules on '6.7 in qt/qt5'
Change-Id: I007bb0aaac0633b06f76795c0e3115a3bc13866b
Reviewed-by: Daniel Smith <daniel.smith@qt.io>
2024-02-09 15:31:31 +02:00
Marianne Yrjänä
1cdaa78534 Set CMAKE_STRIP for QNX builds in toolchain file
Task-number: QTBUG-120594
Change-Id: Ie39a51616d1c1bb03382bc633d9cda11f80fc80f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit 02199c9f75)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-07 07:44:16 +00:00
Assam Boudjelthia
de0797d809 Android: use Android emulator 32.1.15 to not break rhi tests
Currently CI doesn't cache specific Android Emulator version,
so after an update was availabe 33.1.23 is broke RHI tests on
Android 13 emulator. The last known emulator version to to work
was 32.1.15, so as a workaround we install this specific version.

Fixes: QTBUG-119884
Change-Id: Iec56207b6142d97a9dfabc0fb07a920c868e58b1
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 481825822b)
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 710f03ffcc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-06 18:36:03 +00:00
Qt Submodule Update Bot
cf2365c2ec Update submodules on '6.7 in qt/qt5'
Change-Id: If3a75bbb858f95728f14e56aacd19d7d5379c469
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-02 03:42:12 +00:00
Qt Submodule Update Bot
8a3736df77 Update submodules on '6.7 in qt/qt5'
Change-Id: I7bf9d5ff46157675e1c95f7c1f8298a69e3e7e46
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-01-25 03:16:29 +00:00
Qt Submodule Update Bot
c498f83af8 Update submodules on '6.7 in qt/qt5'
Change-Id: I004945471ecb1e5519b1c8a99d14b9d3b874cd42
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-01-24 03:00:21 +00:00
Tero Heikkinen
a6a703153a Fix OpenSUSE 15.5 with new re-created Tier1 image
Task-number: QTQAINFRA-6065
Pick-to: 6.6 6.5
Change-Id: I24530bcca2a8f8e50686703d8cd8519c27195de2
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit b6829751d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-01-19 10:24:04 +00:00
Simo Fält
7f217718ff COIN: Remove 'Sccache' feature from arm Mac
There is no sccache binary for arm mac so in case of failure the fail
parser reports failing sccache command as a reason.

Change-Id: I3bfd6152d5be2cd00fd19762ed89ae0bc4f7ebcc
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a00fb312a2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-01-17 07:44:14 +00:00
Axel Spoerl
769e914ddc COIN: Install dummy sound device on openSuSE Leap 15.5
Add missing dummy sound device, to prevent sound based tests from
failing / flaking.

Fixes: QTBUG-120655
Pick-to: 6.6 6.5
Change-Id: I555d1391b49892226732f36c6a67be7d8dae3d4b
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 198cd69244)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-01-12 10:31:07 +00:00
Matti Paaso
e94e10c621 Add permissions on macOS11
RTA android tests fail due permission error

Task-number: QTQAINFRA-6005
Change-Id: I560b8d0efcc6e5b271514e2ce728988435156604
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 164d38c994)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-01-11 16:21:33 +00:00
Kai Köhne
fd3ac6d10a Remove 'old' LICENSE files
We switched to spdx/reuse a while ago. That transition is now almost
complete, so let's remove the old files. The new ones are in the
LICENSES directory:

LICENSES/GPL-2.0-only.txt
LICENSES/GPL-3.0-only.txt
LICENSES/LGPL-3.0-only.txt
LICENSES/LicenseRef-Qt-Commercial.txt
LICENSES/Qt-GPL-exception-1.0.txt

Task-number: QTBUG-67283
Change-Id: Ie42673e28071dbfcb4df6022d15a0eb545305f7a
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit c2d36b3ed6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-01-11 12:57:15 +00:00
Matti Paaso
b2f16b7e43 Fix windows network adapter name for Windos 10 x86
Using the same solution as all the other Windows VMs

Pick-to: 6.5 6.2 5.15
Change-Id: I643f332c99e62ba8037e2db60fa69298a585b306
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 823f127bed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-01-10 12:43:53 +00:00
Simo Fält
1b4262e413 Change resolution for one more display in Windows
Amends change 349ce73bba

Pick-to: 6.5 6.2 5.15
Task-number: QTQAINFRA-5987
Change-Id: I2682ed5de49583460fc2db2f534e8c284c10d11f
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 186a8ca970)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-01-08 06:10:20 +00:00
Artem Dyomin
fbae0d81d6 Revert "Retain symlinks upon making universal macos binaries"
This reverts commit a3c489b272.

Reason for revert: Mistakenly replaced 'set -e' => 'set -x' just hides the problem on macOS 11 and 12. The patch needs to be investigated again

Change-Id: I238395fd2ae1fc362a0c9af02e2d48acce22e0dc
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit f87f27dc62)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-30 09:57:08 +00:00
Jøger Hansegård
a82fde1e9f Disable the truemotion1 decoder for the FFmpeg media backend
The truemotion1 decoder depends on a truemotion1data.h file which is
part of FFmpeg. This header file has a reference to GPL licensing, and
although the header provides a rationale for why the decoder tables are
not copyrightable, we prefer to not distribute this decoder as part of
the online Qt installer.

Users who need ability to decode truemotion1 format video files can do
so by recompiling the QtMultimedia FFmpeg media plugin against a custom
build of FFmpeg.

Task-number: QTBUG-118204
Pick-to: 6.6 6.5
Change-Id: Ia195ef9ce576d18047e7b38bbc5019648ba42b4c
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 027acd91fd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-25 20:26:57 +00:00
Artem Dyomin
6d425779cf Retain symlinks upon making universal macos binaries
Saving symlinks is important when we build dynamic libs,
it will be needed for building QtMM + dynamic ffmpeg.

Pick-to: 6.6 6.5
Change-Id: Ic356a9c3df727a1afe14e8553728952d3b106ba3
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit a3c489b272)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-24 18:04:03 +00:00
Assam Boudjelthia
387ff3e6c2 Android: quote the logcat tag passed to emulator command
To avoid any issue parsing the command params.

Task-number: QTQAINFRA-5596
Change-Id: I473839901934405d4ea8607bc98f7b3e3a886805
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit e0498fc679)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-23 21:30:12 +00:00
Assam Boudjelthia
7f532a7fee Coin/Android: print emulator errors/warnings to coin and log file
Making emulator errors and warnings available directly in the ci run
logs makes it easier to debug issues.

Amends 1c27f95d01.

Task-number: QTQAINFRA-5596
Change-Id: I2388dcf9fcdcf18803ff03266493584216f92fdc
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 23b09c1d2a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-23 21:30:09 +00:00
Elias Toivola
bf09d0fe5b Update Android NDK to version r26b
Revision 26.1.10909125. Also prebuilt OpenSSL 3.0.7 with it.

Task-number: QTQAINFRA-5771
Change-Id: I0dbe1f2d38f277bcb805f5b7ac1f30e25aabd1f8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
(cherry picked from commit 782e1700cf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-23 21:30:03 +00:00
Qt Submodule Update Bot
938ede4051 Update submodules on '6.7 in qt/qt5'
Change-Id: I6f48e23804d4ddd1f0c087e9eb5dcbd919071d0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-23 05:45:50 +00:00
Heikki Halmet
f0fb226c19 Add refresh support for all Red Hat versions
Pick-to: 6.6 6.5 6.2 5.15
Change-Id: I1fbfadf70a9b7dbf0f738aa41d627adfac6138c5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 3c5d9cabf0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-22 04:55:28 +00:00
Toni Saario
d497b98b02 Set resolution for newer qemu displays
Windows recognizes newer qemu as different display, which needs
to be handled as well.

Pick-to: 6.5 6.2 5.15
Task-number: QTQAINFRA-5987
Change-Id: I6819bfa6dd90a3f54cfcb0b5b885ba909052d375
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 349ce73bba)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-21 12:50:19 +00:00
Elias Toivola
2f0726c8ca Android: Update Android 14 system image for emulator
Use the latest Android 14 image in CI Android emulator. Build ID:
UE1A.230829.036. This should reduce tests crashing with Android.

Task-number: QTQAINFRA-5971
Change-Id: Id9c221118163feef722e402d9e412381809b6b72
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 7bc6a1c869)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-21 12:50:13 +00:00
Qt Submodule Update Bot
2f36ff6add Update submodules on '6.7 in qt/qt5'
Change-Id: Idcff11c00aefb6df69a9e59a285e19b846435abd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-14 04:23:07 +00:00
Lucie Gérard
459151ae83 Update remaining old style license header to SPDX style in coin
Pick-to: 6.6
Task-number: QTBUG-108364
Change-Id: Ic36ce592d0ff698b30fbf2edab106d4af5d31bc2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 3d065be1d0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-12 15:50:27 +00:00
Safiyyah Moosa
a9df6ed369 Doc: Create a CONTRIBUTING.md file
Many users push Qt contributions to the Github repository mirror(s), however we cannot accept these contributions. This file directs users
to Qt's contributing guidelines wiki page.

A .github/pull_request_template.md file has also been created for Qt
project.

Fixes: QTBUG-116663
Pick-to: 6.6 6.5
Change-Id: Iea4cba8e6cb90859bd364ae4480be0e000f9bae6
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit baf7aacdac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-12 07:06:11 +00:00
Lucie Gérard
6affbbde90 Update license header to SPDX format
Pick-to: 6.6 6.5
Task-number: QTBUG-67283
Change-Id: Id3679318557c7611b040b155fe1c815e1093d8f9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit a09d8e0ae6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-12 07:06:11 +00:00
Jukka Jokiniva
d532c4d941 Make Integrity temporarily non-blocking in CI
GHS compiler license expired, so Integity target
changed to insignificant.

Change-Id: I927d1c2fd2a255351dbe7582f9564a0b4227ee46
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 25eb7f8a36)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-11 13:04:05 +00:00
Jani Heikkinen
994d92fe1a Adjust submodule branches
Change-Id: If4ed6a9af7572944728546c2ccf10ff99ec78e87
2023-12-11 08:03:21 +02:00
Samuli Piippo
ab9c497225 Add platform configs for meta-boot2qt-qcom
CI configs for new Boot2Qt repo.

Change-Id: Iab71a549356bf2dd72c67dbaf624e3d3c8cdc146
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-12-05 11:32:02 +02:00
Ari Parkkila
1a9363044c Add platform configs for meta-boot2qt-aws
CI configs for new Boot2Qt repo.

Change-Id: Ib49d66f488ada3c743161a8f256a0c8c8f98728e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-12-05 11:32:01 +02:00
Qt Submodule Update Bot
2df27331f9 Update submodules on 'dev in qt/qt5'
Change-Id: Ie2264d86613f226e3605eb8af0d71d25135f29c4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-04 12:40:03 +00:00
Qt Submodule Update Bot
024d2f039d Update submodules on 'dev in qt/qt5'
Change-Id: If3e5412b5e1c4aa15124b0045f2c243490243231
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-02 08:55:43 +00:00
Qt Submodule Update Bot
e57e7e3fa7 Update submodules on 'dev in qt/qt5'
Change-Id: I42b3d229bb150200260f844c27445358b8208ce2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-01 07:04:32 +00:00
Qt Submodule Update Bot
c0f9a30385 Update submodules on 'dev in qt/qt5'
Change-Id: Ieab16ee3160e8542e13b1edb9d1055e0a201b067
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-30 04:59:34 +00:00
Qt Submodule Update Bot
250c2b22b5 Update submodules on 'dev in qt/qt5'
Change-Id: I58f6efc608ad50213312becd4ae798c33b9f0179
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-25 04:56:19 +00: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
Heikki Halmet
03451662de Provisioning: Install util-linux package for license service
This is required for macOS ARM target in license service

Task-number: QLS-455
Change-Id: Id424853f228f7105b9da56c3968ffa90df18ac61
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
2023-11-24 11:53:35 +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
Bartlomiej Moskal
65101a61e6 Coin: Enable openssl for Android FFmpeg install script
The FFmpeg library should use dynamically linked OpenSSL. To make it
possible --enable-openssl flag need to be set. Additionally correct path
for OpenSSL need to be passed to FFmpeg configuration script.

Task-number: QTBUG-110805
Task-number: QTBUG-114954
Task-number: QTBUG-113980
Pick-to: 6.6 6.5
Change-Id: Id887c2c4083663a674123a0f0003b44661149116
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-11-22 10:54:58 +01:00
Qt Submodule Update Bot
dd789418a4 Update submodules on 'dev in qt/qt5'
Change-Id: I4511190f463102c52f20f5b5d94b462c7aac58df
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-20 17:54:58 +00:00
Petri Virkkunen
e9325a87a6 Upgrade Python on RHEL 8.8 from 3.8 to 3.11
In order to avoid installing packages to one version of python and then
trying to use them from another version, stop installing python 3.8 and
simply install Python 3.11, along with pip.

Change-Id: Id2f63a6d1aff0d3fd3a5934887fe82a642f6ab92
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
2023-11-20 19:54:57 +02:00
Matti Paaso
c886c32307 Provisioning: Add ICU 73.2 into Debian aarch64
ICU packages has been compiled in LoA. This script will install
it into Debian.

Task-number: QTBUG-118676
Change-Id: Ic3ffa6881815d6017e7a855e62859b9104f49fae
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-11-20 14:56:00 +02:00
Jani Heikkinen
e05c8b8313 Move wasm multithread build from intel mac to openSuse
The same wasm binary is used in every hosts so it doesn't matter in which
host the build is done. That's why move the build from intel mac to linux
to save limited intel mac resources

Change-Id: I13212fc3950e90b6da4298a7cf8b67c7fa96cfb8
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-11-20 12:55:56 +00:00
Qt Submodule Update Bot
0cc389bcc8 Update submodules on 'dev in qt/qt5'
Change-Id: Ic0f42ba9a1a8d78a4c4fcaa44a8a32148dff1623
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-17 16:28:07 +00:00
Tor Arne Vestbø
760cf59266 Stop testing macOS developer builds on x86_64 hardware
Our x86_64 pool is overloaded, so we need to reduce jobs.

As we're testing our packaging (universal) builds (both the one built
on x86_64 and the one built on arm64) on x86_64 for all macOS platforms
we support, it should be fine to remove the x86_64 tests of the
developer builds. These developer builds are still tested on arm64,
so the only test coverage we're losing on x86_64 are the subset of
tests that depend on QT_BUILD_INTERNAL.

Change-Id: Ia83964cc77d04ba796e3a59389ce000a51dcac93
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-11-15 18:54:50 +01:00
Tor Arne Vestbø
021c7b6b0a Remove macOS 14 nightly template
Change-Id: Ieac3f8d6b4860d7ee8b67a3e9a812a9c67fa9a18
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2023-11-15 18:54:46 +01:00
Alexandru Croitor
bae2268c47 CMake: Update provisioned CMake to version 3.27.7
We want access to the debugger, and also to be in sync with the CMake
shipped with the Qt SDK.

Task-number: QTBUG-118138
Change-Id: I4b43b9543e8e6ef23c9608a8e1c623ee16edfbd5
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-11-15 09:14:29 +01: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
Samuli Piippo
9b067849bf Add insignificant targets for Yocto builds
Add few targets that can be used to do speculative builds that may fail
without causing integrations to fail.

Change-Id: I44b1afcf4db22be2f930e31e2a5d39fb3697d2fe
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-11-14 20:33:04 +02:00
Allan Sandfeld Jensen
23ab8c94b0 Add libatomic to RHEL 8.8
Needed for qtwebengine 6.7

Pick-to: 6.6 6.5
Fixes: QTBUG-119109
Change-Id: I38d78731578dcb4ce5a8755d116e1326e6d6ffa4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-11-14 18:32:50 +00:00
Qt Submodule Update Bot
bee4591acd Update submodules on 'dev in qt/qt5'
Change-Id: I4498bc330cfbcc7cffc54d8f5ea72ae2ff2684dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-14 06:11:54 +00:00
Dominik Holland
123b4be006 Add python3-venv to aarch64 debian
Needed by qtinterfaceframework

Pick-to: 6.6 6.5
Change-Id: I2c2d7d193ae2034fadd41864b430620ee635d9d0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2023-11-13 10:47:12 +00:00
Qt Submodule Update Bot
eadc7461ca Update submodules on 'dev in qt/qt5'
Change-Id: I1769b9bbff35f1ea6da2d978a5d8a3265808f244
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-11 16:27:49 +00:00
Tor Arne Vestbø
706155cf4b coin: Make macOS 14 configurations significant
They are green on all modules now.

Fixes: QTBUG-115945
Change-Id: I63838b6aa4e033938303bb13d0881f59004275c2
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2023-11-11 17:27:48 +01:00
Michal Klocek
f43a26a96e Fix the wrong call in ps1 files
This amends bb82c65ac0

Task-number: COIN-1077
Change-Id: Ib9d2bb05530aa1b760accecf908a2359cab49157
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-10 12:56:23 +00: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
Johanna Äijälä
72861b5f57 Provisioning: add nodejs18 to SLES15_SP5
Needed for QtWebEngine build done in RTA.

Pick-to: 6.6
Change-Id: Ia2338ac9446960cd6a56d4956126698e9400af32
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-11-08 22:38:39 +02:00
Aku Pietikäinen
854bc07fc2 Revert "Add usr\bin\ to path on windows"
This reverts commit 50aa0031a4.

Reason for revert: Change replaces PATH and causes some built-in
commands to be replaced with breaking Git equivalents.

Change-Id: I9e25238c8f84cfc5ad44e1cdfb0a0fe33a60dcfe
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-08 19:16:34 +00:00
Michal Klocek
bb82c65ac0 Set longpathsenabled reg key on windows
Besides proper manifest registry has to have a proper long path key.
The coin vms have this registry key not set. Fix it.

See: https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation

Task-number: COIN-1077
Change-Id: Ia2eb8531c1881cfc67de537a1cb25be56274c031
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-07 17:01:12 +00:00
Casimir Saastamoinen
23116e7331 Configure pip for internal cache
Task-number: QTQAINFRA-5531
Change-Id: I89c5502f62b2777a06b8f301a9fbaca1a3f8859d
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-11-05 12:06:07 +03:00
Casimir Saastamoinen
50aa0031a4 Add usr\bin\ to path on windows
Task-number: COIN-1060
Change-Id: I2ab63617f417b92a4d858c5da301185693e799f3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-11-05 12:06:04 +03:00
Amir Masoud Abdol
1fd6fb3565 Provisioning: Mount Vcpkg Cache Drive on macOS
Change-Id: I3038467c98a7c2a5f3b05d7b370d9ec0ea95156d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-11-05 10:05:59 +01:00
Amir Masoud Abdol
991ed8bc74 Provisioning: Install cif-utils (and keyutils) for mounting SMB on Linux
Change-Id: I91df89bd9741010f384c2c097363614438819a92
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-11-05 10:05:55 +01:00
Amir Masoud Abdol
9d8337ac91 Provisioning: Mount Vcpkg Cache Drive on Windows
Change-Id: Ib8d0722cdfc8cc16e52f3ac38ef5cc4ff210d751
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-11-05 10:05:51 +01:00
Amir Masoud Abdol
10b0282ea2 Provisioning: Mount Vcpkg Cache Drive on Linux
Change-Id: Ib7345f622e05248aa0a61e44a4d079666e56ae7d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-11-05 10:05:47 +01:00
Tony Sarajärvi
070b3bf26e Remove unused variable from mimersql.sh
Change-Id: I1f77dfcac4988c0e377b68b9d6b85cf265869aea
Reviewed-by: Fredrik Ålund <fredrik.alund@mimer.com>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-11-05 09:05:43 +00:00
Tony Sarajärvi
f7fb9e99f7 Update llvm-mingw to 17.0.3
Change-Id: I2a44fd8d5dd75771539926a55c5da784267d595f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-11-05 09:05:38 +00:00
Marianne Yrjänä
931f282b7a CI: Add minimal multimedia support for QNX qemu
Add minimum set of libraries needed for running qtmultimedia autotests.
QNX qemu doesn't support graphics which limits the amount of runnable
multimedia autotests for QNX.

Task-number: QTBUG-92226
Pick-to: 6.6 6.5
Change-Id: I72973d5582389877dc112f98f5a62a7aaa07d23a
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2023-11-04 11:27:10 +03:00
Marianne Yrjänä
b5607a5894 QNX: Add CMAKE_SYSTEM_PROCESSOR definition for QNX toolchain files
Add CMAKE_SYSTEM PROCESSOR definition and use that for finding processor specific binaries from QNX SDP.

Task-number: QTBUG-116082
Pick-to: 6.6 6.5
Change-Id: I893cac45058d8e0ac6228159e9b97bc59307ff35
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-11-04 08:27:07 +00:00
Bartlomiej Moskal
2d3245e0ea Coin: Install FFmpeg for Android on missing targets
On qtci-macos-13-x86_64 host CI tries to build and run the test on
Android (arm64) while we still haven't managed to install FFmpeg for it.
The same situation happened with qtci-linux-RHEL-8.8-x86_64 and Android
x86.

Task-number: QTBUG-110805
Task-number: QTBUG-114954
Task-number: QTBUG-113980
Pick-to: 6.6 6.5
Change-Id: If953221b104d5bb8fce9d48f8ecd977c2e80c41d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-11-02 20:11:01 +00:00
Bartlomiej Moskal
185b7219a4 Coin: Fix install-ffmpeg calls for android
There is a specialized script to install FFmpeg for Android. Use it
instead of common install-ffmpeg.sh (which does not work for "android"
parameter).

Task-number: QTBUG-110805
Task-number: QTBUG-114954
Task-number: QTBUG-113980
Pick-to: 6.6 6.5
Change-Id: I2409e0f8ffe0f8b28eadce4738c2551fe00a7fbf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-11-02 17:40:26 +02:00
Matti Paaso
6ddb97c90e Provisioning: Fix icu 73.2
Icu packages overwritten in ci-files01-hki, and file hash
changed.

Change-Id: I4755e13409cd4af008919ae3905fdb21fb893795
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-11-02 17:40:23 +02:00
Matti Paaso
c3d0b1461a Add Axivion analysis linux target for new modules
Adding Axivion analysis insignificant target for
qtapplicationmanager and qtinterfaceframework

Task-number: QTQAINFRA-5683
Change-Id: Ib9f839c6126883e8fa94218a9f00dc8785811540
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2023-11-02 11:18:47 +03:00
Elias Toivola
64673dbe75 Disable clangcpp in Ubuntu 20.04 C++17 nightly run
Our self-built libclang cannot be used in this platform configuration as
it causes linker errors in Qttools. Disabling clangcpp also disables
QDoc.

Task-number: QTBUG-113649
Change-Id: I80ac05c173397bfc573740bbf7b02cc0acc7fadf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-11-02 09:35:42 +02:00
Petri Virkkunen
eb100b6e3b Add AAOS10 image for Android Automotive emulator as minimum supported SDK
Android Automotive should follow the lead for Q4A and regularly test
changes with both the minimum and then maximum supported SDK levels.
These are Android 10 and 13, of which 13 is already active on the CI.
This commit adds a Configuration for Android 10 and support for
creating an avd for that image.

Task-number: QAA-2073
Change-Id: I6d22c68f10a5da4b46664c67cf1369cbc7f5a537
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-11-01 16:54:30 +02:00
Petri Virkkunen
ce7be1254b COIN/Android: Specify tags for emulator logcat output
Without specifying tags for logcat output, the flag -logcat-output does
not actually write anything to file. Looks like -logcat-output is
designed to take any logcat output that would be written to the
emulator output and write it to a file instead, so if there is no
logcat output in the emulator output, there will be no output to file.

Task-number: QTQAINFRA-5908
Change-Id: If44265c858f8cb6854659fed6dd15d02cbf1d7ab
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-11-01 17:54:28 +03:00
Aku Pietikäinen
cebd09e9ea Update webos tier 1 image
Increase Ubuntu 20.04 disk size to 1 TB to fix webos build.

Change-Id: Id1290bf7745f500097341bd8476dc5be45b69b0d
Task-number: QTQAINFRA-5898
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-11-01 11:42:46 +00:00
Tor Arne Vestbø
5de62a4a74 coin: Remove macOS 11 x86_64 developer build and arm64 packaging tests
We're running out of capacity for macOS 11 nodes, so let's reduce the
test coverage, now that macOS 11 is no longer a primary platform.

It's still supported, so we keep one x86_64 and one arm64 config.

Change-Id: I3fc4c3a12967b937ef59fd190074dac30dedd2be
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-10-31 01:21:06 +01:00
Matti Paaso
95e4077203 Change Axivion bauhaus-suite version to 7.6.2
Also, axivion_config changed to correspond new release. Common
part of the configuration has been removed from all submodules
and added into common configuration.

Change-Id: I724f020e4299077068d0d623efb63700848e6bf4
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-10-29 07:52:48 +03:00
Tor Arne Vestbø
7cc0a72d44 coin: Add insignificant configurations for macOS 14
Change-Id: Iab3aea900d570a10a1e4100665ea2b4f7b89afbb
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-10-28 21:38:26 +00:00
Tero Heikkinen
530f00502a Provisioning: Fix SLES 15 SP5 packagekit flakiness
Task-number: QTQAINFRA-5899
Change-Id: Ie5070cc4d99e7fe451c394c3078aeb60e8332fff
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2023-10-27 21:55:15 +03:00
Petri Virkkunen
3f2386f2c4 Android: Use Android 14 Beta image instead of downloaded one
After Oct 4th Google Android 14 release, few cases started to fail.
Cases did not fail earlier. Earlier system images were downloaded.
This change introduces system image storage to CI-files.

Task-number: QTBUG-117994
Change-Id: I143691f6d87f8c9b40b1f5744164cb0d22c219c3
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-10-27 21:55:14 +03:00
Heikki Halmet
4067395aee Provisioning: Upgrade ffmeg version to fix make issue with SLES
Version points to commit:
c5039e158d20e85d4d8a2dee3160533d627b839a

This commit is the latest one in 6.0 branch. This way we'll get
fix also for https://fftrac-bg.ffmpeg.org/ticket/10405

Version should be changed to official release
when the next official release is available.

Pick-to: 6.6
Task-number: QTQAINFRA-5912
Change-Id: I4e7acea5a54ce692334c7fe22ba074791c94cf03
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-10-27 18:55:12 +00:00
Samuli Piippo
f4f2ebae60 Add platform configs for boot2qt-manifest repo
Change-Id: I3746cb708f54c7a17f54fd38ae58cca87d0b5724
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-10-23 11:26:40 +03:00
Ville-Pekka Karhu
2cf8bbf580 Provisioning: Update macOS 14 Intel nightly Tier1 version
This change updates macOS 14 from beta version to released version 14.0

Change-Id: I6e87ee51efcce5edcdc853048c67598c02b3defe
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-10-23 08:23:40 +00:00
Topi Reinio
a345c01d68 coin: Update provisioned qdoc, qtattributionsscanner binaries
Update qdoc and qtattributionsscanner to the latest version from
qttools/dev.

qtattributionsscanner is updated to a version that supports multiline
copyright entries as a string array.

Task-number: QTBUG-111873
Pick-to: 6.6 6.5
Change-Id: I7dccdd431015610dcead220fa4cf3b5640049ece
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2023-10-23 07:05:20 +00:00
Teemu Holappa
475b77c125 Add COIN configuration for meta-qsr layer
Task-number: QSR-2019
Change-Id: Id1f5729bd286618f00c24d4956e986215970ad0b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-10-23 06:07:22 +00:00
Elias Toivola
ab4ba58eeb Remove Android 13 from CI, set Android 14 as max version
Task-number: QTQAINFRA-5770
Change-Id: I29347255f9e606b9aa32fe000325cf57d4eb1b30
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2023-10-22 18:27:31 +03:00
Dimitrios Apostolou
491fb5492e Use latest CMake version for the ASAN configuration
This fixes  ctest --stop-on-failure.

The minimal CMake version is tested separately on a non-ASAN config,
no need to test it again.

Pick-to: 6.6 6.5
Change-Id: I71e0158fca0d1ef19449b034faa119f8cf2d3519
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-10-21 00:23:44 +02:00
Fredrik Ålund
b073e4c5d8 Mimer SQL: Do not unpack directly to /usr/local and use sudo
Unpacking the Mimer SQL universal binary package fails on macOS 14-arm.
Do not unpack directly to /usr/local and use sudo. Verify that all
directories exist.

Fixes: QTBUG-111219
Pick-to: 6.6
Change-Id: I5f1bf3413103c07a94a47b5421c41b8b1234ca22
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-10-20 05:31:03 +00:00
Qt Submodule Update Bot
26ccf4dfd7 Update submodules on 'dev in qt/qt5'
Change-Id: Iec6d0d6db38ec09b51f600f06768d1ced021fa6e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-20 02:37:09 +00:00
Michal Klocek
fedf1d863a Fix ninja long path support
Ninja has issues if path exceeds 260 chars. The issue
is reported here https://github.com/ninja-build/ninja/issues/1900
and can be easily fixed by doing correct setting in
manifest file. Unfortunately the author still did not make
release with the fix.

QtWebEngine/QtPdf build generated file paths can exceed 260 chars
especially if build is done on android platform, which leads to
issues when running ninja as it get wrong 'dirty' and
'missing' nodes info.

Add workaround and patch manifest during installation.

Task-number: COIN-1077
Change-Id: I89166de73400de63bc3d1116b87c0f0754f36a2e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-10-18 19:43:52 +02:00
Fredrik Ålund
3d354bf9c0 Add universal binary for Mimer SQL on macOS
Do not use the Mimer SQL installer on macOS since it is not universal.
Instead, use an archive with the needed library and include files.
Use a universal binary on all macOS version from 11 and up.

Fixes: QTBUG-111219
Pick-to: 6.6
Change-Id: I4a3716b1207ee966f36e977fe5f9d1016fb9efcb
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-10-13 09:55:21 +02:00
Qt Submodule Update Bot
192856ef62 Update submodules on 'dev in qt/qt5'
Change-Id: I90b67ec626598d7a59e2c18ed5fb63344173f988
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-13 07:15:46 +00:00
Artem Dyomin
aea9fc281c Install vlc binaries on ubuntu and macos for QtMM streaming tests
Cross-platform VLC provides a cmd-line interface for creating media
streams, we use it in QtMultimedia integration tests.
In the future, vlc might be replaced with something more light-weight,
but for now let's just start running the streaming tests at least on
these platform.

Pick-to: 6.5 6.6
Change-Id: I887a98a1ee8f4a9f0a08d16124303bd10fa5a6ba
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-10-11 13:16:19 +00:00
Kai Köhne
938e4c74ea Make qtmultimedia a hard dependency for qtspeech
Since commit 1764bc86cdfc22154a (qtspeech.git), Qt Multimedia is a
dependency for all of qtspeech. So let's also mark this as required
for top-level builds.

Change-Id: Iddc47fe7b57afeaf13c0ba36aa1517bf81794f75
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-10-09 14:21:11 +02:00
Ville-Pekka Karhu
2a7c5cdf71 Provisioning: A better fix for enabling zsh history
Change-Id: I089ae9ea42b51b66009c1e2c50910ea689500aa1
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-10-09 09:10:15 +03:00
Simo Fält
d3c761ae13 Provisioning: Fix macOS 14 python installation
Change-Id: Ibe1e40fbede609665f1a83e79df5cdc07d23cb5a
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-10-09 06:09:35 +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
Qt Submodule Update Bot
f5d48d4bd0 Update submodules on 'dev in qt/qt5'
Change-Id: I2a55d816274e021f13dfd2799987008d2243b2b6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-07 06:44:52 +00:00
Fredrik Ålund
1927326833 Install Mimer SQL on macOS
Mimer SQL is needed to build the QtSql Mimer SQL plugin.

Fixes: QTBUG-111219
Change-Id: I678c095068fd096f8632f9cdbb00b1bdf96bbe45
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-10-07 06:44:51 +00:00
Qt Submodule Update Bot
35fe846d56 Update submodules on 'dev in qt/qt5'
Change-Id: I604c3fbc299bfa96031df731f330b66c495d0ede
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-04 13:42:22 +00:00
Samuli Piippo
6cf294e362 Update libusb to 1.0.26 on Windows
Add support for arm64. Static libusb binaries packaged from
vcpkg builds with MSVC2019.

Task-number: QTBUG-117504
Pick-to: 6.6 6.5
Change-Id: I0ec4bc6eb2976f22e94533d91b8e1ff9af020e57
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-10-03 20:43:58 +03:00
Samuli Piippo
f68c116871 Add libusb to aarch64 debian
Needed by QDB.

Pick-to: 6.6 6.5
Task-number: QTBUG-114257
Change-Id: I4f17c4fda628e7fd58c71fb088d940dc14dce89a
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-10-03 20:43:58 +03:00
Simo Fält
a46d0c19df CI: Fix cmake debian package path for arm
Change-Id: Ib1ea0b7bec0e00b50c957ae0f530284ae32bbe9b
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit f8f18afaa2)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-10-03 17:43:58 +00: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
Ville-Pekka Karhu
8e5e4d5e2c Provisioning: Fix for enabling zsh history
Change-Id: I9b1af1f99181a7b1c0a4acded4022a26fbf5a641
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-10-03 08:16:19 +03:00
Qt Submodule Update Bot
893ce64fbe Update submodules on 'dev in qt/qt5'
Change-Id: Id4697753052ffa8ebd9ac08cb8818c9ae0edc70f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-03 04:10:32 +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
Minna Erälä
dac25765dd Add ubuntu-20.04 for RTA
Patch2: Move configuration to RTA-specific file

Pick-to: 6.6
Change-Id: Ifa8ddb29069ea8aa419e1f1ffa79c316eb9e2266
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-10-02 12:17:03 +03:00
Elias Toivola
bbbe558077 Fix FFmpeg nv-codec file SHA and cache
External URL file SHA changed and the cache file didn't exist.

Pick-to: 6.6 6.6.0 6.5 6.5.3
Task-number: QTQAINFRA-5862
Change-Id: Ib4670d367d6541e67eb54dd3fb84079548b13722
Reviewed-by: Liang Qi <liang.qi@qt.io>
2023-09-30 10:24:34 +03:00
Ville-Pekka Karhu
117c1b30cd Provisioning: Update macOS 14 Xcode version to 15 official release
Change-Id: Ia50d9363ba81c1a8cb9cd334a1b380a22518913e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-09-28 16:46:36 +03:00
Michal Klocek
dcf72e8116 Update Nodejs on windows to 20.7
Update nodejs to fix flacky webengine builds on windows due
to uv console init race condition.

Leave LTS nodejs release on other platforms.

Fixes: QTQAINFRA-5437
Pick-to: 6.6 6.5
Change-Id: Id066d29c819afe8e7de168a8d35d078c5408acef
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-09-28 11:20:43 +00:00
Alexey Edelev
c8062a4244 Add QtSortModuleDependencies.cmake
The script produces the list of Qt submodules that are required to
build the submodules listed in the QT_BUILD_SUBMODULES variable.
Also the script supports the "collect all but skip repos" mode.
The repos that needs to be skipped should be specified by setting
BUILD_<repo>=FALSE.
The resulting list preserves the required build order.

Change-Id: Ia1cfe0ce013f80dc2793a0ba863a18789657e5a1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-09-28 11:02:30 +02: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
Tony Sarajärvi
1576772ad9 Fix shellcheck complaints on SLES provisioning script
Change-Id: I0ac463851ef65f449165f7fa36008093850861db
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-09-28 06:49:16 +00:00
Qt Submodule Update Bot
2ff9477687 Update submodules on 'dev in qt/qt5'
Change-Id: Icf25c138b69a48f4116c81dace3b355571a62046
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-27 21:10:59 +00:00
Petri Virkkunen
879092ecc1 Update Android Automotive emulator image to AAOS13
Task-number: QAA-2036
Change-Id: I6f27bf9edbd5c7b4f0a3124d888e3b0ac2f48bfa
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2023-09-27 08:58:24 +03:00
Jussi Witick
c8434c0d6f Add Axivion analysis target for QtSafeRenderer runtime on INTEGRITY
Add Axivion MISRA-C++ analysis target for QtSafeRenderer runtime
on INTEGRITY. The results will be posted in the qtsaferenderer/integrity
target in the Axivion dashboard.

Task-number: QSR-2186
Change-Id: Ice8115dbe8dc1dacfbfca493c77d95eb95088439
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2023-09-26 10:01:10 +00:00
Qt Submodule Update Bot
69285d06e3 Update submodules on 'dev in qt/qt5'
Change-Id: I9661c39cc2e8ae17321d7c356248a402b7d662c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-25 17:59:48 +00:00
Safiyyah Moosa
80573dd36b Doc: Create README template
There are many Qt submodules, and it would be beneficial to users if
there was a standard README template that will enable them to understand
and access the submodule content better. Currently many of the
submodules do not have README documents, or if they do, each submodule
varies vastly regarding what content is in the document. This proposed
README template is based on the Git ReadMe structure.

Task-number: QTBUG-114809
Pick-to: 6.5 6.6
Change-Id: I3d1d1da27ed665e76ee6d1df8a93c3e5a920b0a3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-09-23 10:27:29 +02:00
Qt Submodule Update Bot
396b1b626d Update submodules on 'dev in qt/qt5'
Change-Id: I17e6fa6a13a6c35823438435ff42845f478b050e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-21 13:51:05 +00:00
Tor Arne Vestbø
1a5c03a20f coin: Re-order and comment macOS build configs
To clarify what we do (and don't do).

Change-Id: I719f538e7abce279b619a82b80b74bd01d1538d4
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-09-20 14:49:59 +02: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
Alexandru Croitor
29e674d299 CMake: Move some code back into qtbase
It's somewhat painful to do changes in the top-level CMakeLists.txt
in regards to calling qtbase commands, because the file needs to be
compatible with different qtbase sha1s while the submodule update
catches up with a new qtbase to be used for qt5.git.

Use the commands defined in the new QtBaseTopLevelHelpers.cmake file to
to move some responsibility back to qtbase.

This way we can hopefully avoid some churn and do direct changes in
qtbase instead.

Pick-to: 6.6
Task-number: QTBUG-112957
Change-Id: Id897a9f7da366b00a0780a2475b1fb5772bbe8bc
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
2023-09-20 08:29:08 +02:00
Allan Sandfeld Jensen
b49729a50c Add vulkan package to SLES
Helps build vulkan support in qtbase, and vaapi support in qtwebengine

Pick-to: 6.6 6.6.0
Task-number: QTBUG-115722
Change-Id: If51bc6a91c69829313991bfa9172026ce54476f7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-09-20 05:01:31 +00:00
Qt Submodule Update Bot
8d5aef0881 Update submodules on 'dev in qt/qt5'
Change-Id: Id0ad0c7ff7d04b207fa9653fbc281d42d7eeca73
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-20 03:20:06 +00:00
Qt Submodule Update Bot
e0729e2a6e Update submodules on 'dev in qt/qt5'
Change-Id: I8da142aedd8a70895700b8d38f4f6cfcc0b7e5b5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-18 20:33:28 +00:00
Nicholas Bennett
6fea315c0f Docs: Make sure documentation tests run on QtAA integration
Previously the dedicated documentation config was removed in favor of including
ubuntu-22.04-documentation.
Since then, that configuration lost the TestDocs flag. It now comes with
ubuntu-22.04-documentation-x11-tests instead, so this change adds that
configuration.

Pick-to: 6.6 6.6.0 6.5
Change-Id: I046f79aa8810ded6aa6dd07814ff43dd3fa2bbe8
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2023-09-14 14:05:28 +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
Elias Toivola
b105bbaab1 Provisioning: Bump sdkApiLevel and sdkBuildToolsVersion to 34.0.0
Task-number: QTQAINFRA-5691
Change-Id: I4c0f92a53165f316da4b69161f0ec7cb6f889167
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-09-14 05:04:47 +00:00
Elias Toivola
b3d10251b4 Fix cache URLs and add missing cache files
The missing files were downloaded from their external source and placed in their directories of the cache URLs. Files: FFmpeg-n6.0.tar.gz, Postgres-2.5-14.dmg, protobuf-all-21.9.zip, MimerSQLInstaller_x64_1107b.exe, FFmpeg-n6.0.zip, msys2-base-x86_64-20220319.tar.xz, python-3.10.0-amd64.exe, python-2.7.13.msi, mimersqlsrv_11.0_amd64-openssl3.deb, mimersqlsrv-11.0.x86_64-openssl3.rpm, MinGW-w64-x86_64-11.2.0-release-posix-seh-rt_v9-rev3.7z

Task-number: QTQAINFRA-5766
Change-Id: Ieacdc9138b71969397d900096956f54faff45918
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-09-14 05:04:44 +00:00
Elias Hautala
a716087c94 Enable example build for Android in CI
Enables building of examples for Android 13 RHEL 8.8 in CI.

Fixes: QTQAINFRA-4435
Change-Id: I370deeb04b58b67ccd7b24f6df21dab911323041
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-09-14 08:04:41 +03:00
Tero Heikkinen
348bd59693 Remove InsignificantTests from RHEL 8.8 before removing 8.6
Before RHEL 8.6 can be removed, newer RHEL 8.8 needs to be
monitored that there is no flakiness and cleared from all
InsignificantTests flags after that.

This is following the new CI process to introduce new platforms.
No flakiness visible, therefore removing Insignificant flag.

Task-number: QTQAINFRA-5768
Change-Id: Iec4b741cd896ce73ba3804c2a971e36eef93b966
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-09-14 08:04:38 +03:00
Tony Sarajärvi
620666bce4 Fix shellcheck complaints about provisioning scripts
Also adds executable attributes to shell scripts that were missing it.

Change-Id: Id52ef495147fdbfb5cb1a1f711fac530e0e85f3b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2023-09-13 06:44:02 +00: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
Elias Toivola
d043fa0a45 Provisioning: RHEL platforms: Wait for PackageKit to finish
PackageKit is sometimes locked when trying to remove it, causing an error in provisioning. Scripts now wait until it is free for removal.

Task-number: QTQAINFRA-5577
Change-Id: I15d6bf5d72ec61517cc42a1dc51012ad60a806e9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-09-12 04:32:58 +00:00
Simo Fält
a2d926fdd1 Provisioning: Copy backported .deb files for sbuild
These are required to successfully build debian packages for
Ubuntu Focal.

Change-Id: I708f3716ba8d1251bfae22da325e8e27f0fb80fe
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 5b30b2f432)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-09-11 10:03:42 +03:00
Alexey Edelev
aae1a25bf1 Add .proto files format to _clang-format
Use the Google format with 4 indents.

Change-Id: I852fabc07e16c19ac5555e4b34400a1c94a9d1d3
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2023-09-11 09:03:26 +02:00
Toni Saario
561f9e287b Add Ubuntu 22 namespace build and doc tests to default precheck
Pick-to: 6.5 6.6
Change-Id: I42b1355406040fbf61339013294232c3f0a339fa
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-09-06 13:53:33 +00:00
Simo Fält
b1ce3549a0 Provisioning: Install missing python3 packages to Debian 11
Pick-to: 6.5 6.6
Change-Id: Ib322d71a2af760f3cedecf73d0b51a1b15e460f6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-09-05 18:12:58 +00:00
Dimitrios Apostolou
64bb2e7480 Introduce ASAN build for qtdeclarative
Fixes: QTQAINFRA-5755
Change-Id: I9fe2df9810baa793f2b063f09e2fec2e9786acd0
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-09-05 20:12:53 +02:00
Simo Fält
68e8df875d COIN: Fix Linux config id for qtpip
Change-Id: I8eb08d540d4a70f131d691cc6505bd0df8402135
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-09-05 19:29:22 +03:00
Alexandru Croitor
cbb50f2e0b CMake: Remove unused variable
Pick-to: 6.5 6.6
Change-Id: I8f79797428226b376a21813c91c87b5bfe8b390b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-09-05 18:29:18 +02:00
Artem Dyomin
7300099520 Add openssl to ffmpeg linux builds
We need ffmpeg+openssl to enable multimedia networking.
We kept it disabled on linux since we had linking dependency.
The related patch in QtMM resolves openssl symbols dynamicaly
and address the mandatory dependency.

Pick-to: 6.5 6.6
Change-Id: Idad0618a5320ae32d50fe1f3866c4ffd1bf8f542
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-09-05 16:29:15 +00:00
Marc Mutz
bfb6538af8 nightly_ubuntu_22_04_xwayland: drop -no-warnings-are-errors
I can see why de8a8879bd added
-no-warnings-are-errors (QtWayland tests were full of [=] implicitly
capturing *this), but I've fixed those now, so re-add -Werror.

Pick-to: 6.6 6.5
Change-Id: I48db4cee08bd766b2b00949cdb09a4dd97214298
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-09-05 18:29:11 +02:00
Rami Potinkara
b808969b95 Coin/Android: Add Android 14 to CI
Add Android 14 to CI and keep 13 as maximum supported version, to allow
significant testing for both Android 13 and 14.

Android 13 is not yet removed, because Android 14 is still in beta
phase, so the plan is to fully replace Android 13 with Android 14 once
it's publicly released, and for now test Android 14, to avoid any
potential fails that might come before the final release.

[*] Android 14 is expected to be released late August 2023.

Task-number: QTQAINFRA-5609
Task-number: QTQAINFRA-5557
Change-Id: Ied5c560aa7d60f00948482fb1d7091b3139c6f0c
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-09-05 16:29:06 +00:00
Simo Fält
f8fe54df2a CI: Add platform configs for qtpip
Change-Id: I1e84d4646e12e6da18b2c831d2eb6a7c42e43c9d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2023-09-04 07:42:25 +00:00
Axel Spoerl
095fb20175 Add cache cleanup script to openSuSE 15.4 and 15.5 provisioning
Change-Id: I5f3465f1492fd5c047cfe4cd570a06ec25a73fad
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-09-02 13:58:38 +02:00
Tero Heikkinen
afdcf514f5 Update ICU for RHEL 9.2
Task-number: QTQAINFRA-5654
Change-Id: Ic930147af4fe87545c9e3d4c407b54684eb37d37
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-09-02 14:58:31 +03:00
Lucie Gérard
6757a4c399 Add license directory and update remaining license format in coin
Pick-to: 6.5 6.6
Task-number: QTBUG-108364
Change-Id: I1250a46d60d5b4e85258b93f8f6f6fc4631b3a70
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-09-02 13:58:24 +02: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
Simo Fält
16905c60c1 Provisioning: Install debian packaging dependencies to Ubuntu
Change-Id: I320adf737c7ac9da45e27b30b385318f1d925905
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 442f28b534)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-09-02 11:58:08 +00:00
Qt Submodule Update Bot
f89575f6b3 Update submodules on 'dev in qt/qt5'
Change-Id: I7e9d4630292a0e5dd8dceb0c5183925aaff8be42
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-01 18:18:36 +00:00
Piotr Wierciński
4c3df86e21 wasm: Fix provisioning machine with correct version of Emscripten
The SHA-1 hash was not properly updated after upgrading Emscripten
from version 3.1.25 to 3.1.37.

Pick-to: 6.6
Change-Id: Iad2a8603ce6163545de432a35940c91ee47ffea8
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2023-09-01 18:18:31 +00:00
Jussi Witick
f9cc281e15 Add Axivion analysis target for QtSafeRenderer runtime on qnx
Add Axivion MISRA-C++ analysis target for QtSafeRenderer runtime
on qnx. The results will be posted in the qtsaferenderer-qnx target
in the Axivion dashboard.

Task-number: QSR-2070
Change-Id: Icea1dcaaecb505545f63c518e2dce49865a26505
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-09-01 18:18:27 +00:00
Axel Spoerl
71b55915f0 OpenSuSE: disable kwin overview
The KDE window manager kwin launches window overview, when the mouse
remains in the top left for about 1 second. This causes flakiness in
autotests, if they move the mouse to the top left.

=> Disable the overview function, which is enabled by default.

Change-Id: I43925d15db99f5d40b6cc0cdba39203513e8c59f
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-09-01 06:16:49 +02:00
Lucie Gérard
ae21de72f3 Add license header to provisioning scripts missing one
Task-number: QTBUG-108364
Pick-to: 6.5 6.6
Change-Id: I5b1d53aad917ed38f9e26e1fcc1b97b921c0603a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-08-31 16:25:43 +02:00
Alexey Edelev
4989ee9b24 Enable building of ProtobufWellKnownTypes module on Android
Point to the location of the host well-known .proto files using
the QT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR CMake cache variable.

Pick-to: 6.6
Change-Id: I53c6a76f28736c60d22a9d52e6ae79079b64772a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-08-29 09:52:26 +02:00
Casimir Saastamoinen
949594ef83 Give qt user access to zsh history and transfer .viminfo under qt user
Task-number: COIN-723
Change-Id: I093ba09ffc3b7500ace71b4752f17015859989c7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-08-29 09:58:57 +03: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
Qt Submodule Update Bot
a47b307520 Update submodules on 'dev in qt/qt5'
Change-Id: I4baf1883f0339e0fec229a392449b1634c281500
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-28 06:06:57 +00:00
Artem Dyomin
69c29b7584 Add nvcodec to the ffmpeg build
The patch enables nvidia hardware encoders/decoders.
It doesn't add new package dependencies, ffmpeg loads
required functionality in runtime if nvidia drivers have been
installed.

The change is coming together with implementation of hw devices precheck
in qtmultimedia.

Pick-to: 6.5 6.6
Change-Id: Id54a95b2bacf433950c7b50a42ff99136a143d98
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
2023-08-25 10:54:34 +00:00
Matti Paaso
f80e295d4d Update ICU for RHEL 8.8
Task-number: QTQAINFRA-5654
Change-Id: I2a8b05f144afc05f1049633b7282864e3f6bb81e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-08-24 08:22:20 +03:00
Qt Submodule Update Bot
663f2ed8ca Update submodules on 'dev in qt/qt5'
Change-Id: Iad921e1fe70c3786d8ab0adc90d64f5590e667f9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-23 04:54:58 +00:00
Mårten Nordheim
fba42d674e clang-format: Add space after template keyword
simple git grep-ing shows more uses of _with_ space than without

Change-Id: I0b2d94aa6312dd6856a2b886bc7ec028978dc0cf
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
2023-08-22 14:15:22 +00: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
Casimir Saastamoinen
a4628e939b Change git_lfs install location to versions own repo
Task-number: QTQAINFRA-5573
Change-Id: I481a6d82a6fee2bb849369f98085ccded1ca54a8
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-08-21 12:35:05 +03:00
Qt Submodule Update Bot
1f719c0f57 Update submodules on 'dev in qt/qt5'
Change-Id: I2a71909edd924f84abd669332e84cf58d2013a8c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-21 06:00:06 +00:00
Artem Dyomin
d16fb16c53 Disable vulkan and v4l2m2m for ffmpeg builds
Vulkan:
FFmpeg has a very draft support of vulkan in n5.x and n6.0,
it's promised to be introduced with some working functionality in n6.1.
We'll wait for 6.1, then test it. For now, let's get rid of the extra
dependency.

v4l2m2m:
It's a prospective hw acceleration on linux, especially on embeddded
platforms, but currently, in my experiments, it's not working with
both QtMM and ffmpeg cmd line.
Let's get rid of the not working codec. Hopefully, it'll be fixed
in the future.

Pick-to: 6.6 6.5
Change-Id: I2468f84ae2ec54043d2db83f1a9c08be8e4f509d
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-08-17 11:33:29 +00:00
Aku Pietikäinen
2de9e59be6 Provisioning: macOS 14 x86_64 support
Change-Id: I369beb7a790fbb94bf2c1e9a823734434ea3b3da
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-08-16 16:06:23 +03:00
Matti Paaso
28e1b89e42 Change Java 8 into Java 11 for Windows x86
Jenkins dropped Java 8 support and Windows x86 is still used in
packaging and RTA.

Pick-to: 6.6 6.5 6.4 6.2
Change-Id: I001aacd38147a21944ecaa7223414226a6c500ff
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-08-16 07:37:08 +03:00
Fredrik Ålund
7200dcc016 Fix provisioning script for Mimer SQL on Windows
When building on Windows in the CI environment the Mimer SQL libraries
where not found. The updated script set an environment variable that is
is when building the QtSql Mimer SQL plugin

Fixes: QTBUG-111219
Pick-to: 6.6
Change-Id: Id486a5a3b37d90cd19180f7900456eeae910d1de
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-08-15 10:11:50 +00:00
Qt Submodule Update Bot
805033551b Update submodules on 'dev in qt/qt5'
Change-Id: I8b6dc19221b03ba3058996cf9b6605f165e0787b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-14 19:57:42 +00:00
Elias Toivola
29b68ab740 Provisioning: Enable SSH in OpenSUSE 15.4
Task-number: QTQAINFRA-5628
Change-Id: I0dadf72d1c071cd24240de86cdd68a2c71b58b80
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-08-14 10:58:01 +03:00
Artem Dyomin
76f4cebd21 Add libvaapi to the ffmpeg build on Linux x86_64
We need to provide hw acceleration in qtmultimedia linux packages,
vaapi interface is already integrated to the module.

To be described in QtMM documentation.

Pick-to: 6.6 6.5
Change-Id: I60fcc0b43e5800b7dc5621bfb835c72237fd9b02
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-08-12 15:58:25 +00:00
Amir Masoud Abdol
2f8168436d Provisioning: Update 7zip
Vcpkg needs a newer 7zip, and although it can automatically download,
install and use a newer version, it is better and safer if we can
provide the newer 7zip, and satisfy this requirement.

Change-Id: If9eda0cb6e2a884647a41572e18f9814cb48e0a0
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-08-12 06:30:54 +02:00
Amir Masoud Abdol
4f2a7e6989 Remove the leftover of the already renamed qtci-macos-11.0-x86_64
The platform has already been renamed to `qtci-macos-11-x86_64`, and
this is most likely a leftover.

Change-Id: I431a4c05104788d9b4221de8bafcf122a97eee14
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-08-12 06:30:47 +02:00
Amir Masoud Abdol
12a3ab0059 Update emsdk_windows_3_1_37.zip SHA1
Amends 13c53ef79f

Pick-to: 6.6
Change-Id: I941301daf06f92284d05a84f01b8e97f33c63891
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
2023-08-12 06:30:39 +02:00
Toni Saario
09b407ce19 Fix qsr rhel 8.4 includes
Id has since changed to 8.6. Coin now detects faulty includes and
bails out if some includes are not found.

Change-Id: I2a07931c80b0878d5ace26c7ad8c444d11678a0e
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2023-08-10 09:18:42 +03:00
Matti Paaso
54eb300535 Change icu version into 73.2
Task-number: QTQAINFRA-5654
Change-Id: I93e671447569ff2c34204b645f39c8b4ec841ac6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-08-10 06:41:26 +03:00
Matti Paaso
9a94ba93db Add tqtc-qtsdk.yaml file
Pkg Jenkins wants to use tqtc-qtsdk repository to get machines
from Coin.

Task-number: QTQAINFRA-5501
Pick-to: 6.6 6.5 6.4 6.2
Change-Id: Ief782a4808b7484e456c6e7ca3d156aba8dabdd9
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2023-08-07 13:44:59 +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
Allan Sandfeld Jensen
77e5ed942b Update requires packages for SLES for WebEngine
Fixes: QTBUG-115722
Pick-to: 6.6
Change-Id: I563879a4fd73f99b5d0c275e0c66fc05c7d833a3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2023-08-02 20:21:38 +00:00
Alexey Edelev
bde2b6e0eb Allow building ProtobufWellKnownTypes on WASM packaging platform
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: I3184439d92c8b79c9dc78a117584f7cf56b9eb97
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>
2023-08-02 12:56:37 +02:00
Assam Boudjelthia
6a205068bf Android: use correct version in multi-abi tests target name
The target uses RHEL 8.6 not 8.4.

Change-Id: Ic2ec714032b1c572f4ac88fb400a9bc65f0af61f
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-08-01 13:35:34 +03:00
Ivan Solovev
2ed9f566c1 Update californium docker container
The californium docker container was based on californium 1.0.0, which
is a very old release. This results in some SSL-related errors when
running the Qt CoAP tests in the CI.

This patch updates the docker container. Instead of a custom fork of
a californium server, we use 3.8.0 release tag, and apply a custom
patch locally.
A similar docker container is already uploaded to DockerHub and used
in Qt CoAP examples.

Task-number: QTBUG-114798
Pick-to: 6.6 6.5
Change-Id: I07346f69a6790b4ae648e073440d68f28668cdd0
Reviewed-by: Sona Kurazyan <kurazyan.sona@gmail.com>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2023-08-01 11:25:28 +02:00
Ville-Pekka Karhu
7863f9974c Replace macOS 12 ARM with macOS 13 ARM as a build target
Change-Id: I3c05bf3d33e3360b453417f48e7c7575abde837b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-08-01 12:25:24 +03:00
Assam Boudjelthia
2e96d4eefa Android: Add missing ANDROID_EMULATOR param to Multi-ABI test target
The Multi-ABI targets run a subset of Android tests but the target
doesn't explicitly set the name of the Android emulator to run, so it
was defaulting to Android 6 because the CI Android emulator runner
script defaults to that. The latter is going change to be more explicit,
so this needs to be explicit also.

Pick-to: 6.6 6.5
Change-Id: Ifd5ddd5b5cf3b7a1b275f5a7b1252a21ae3165bc
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-08-01 07:43:46 +00:00
Assam Boudjelthia
1c27f95d01 COIN/Android: improvements to Android Emulator launcher script
* Don't fail silently if the AVD name is not provided.

* Add the following flags to the emulator:
    * -no-window: since we don't really interact with emulator is CI
    * -no-boot-anim: no need to run the boot animation
    * -no-snapshot-load: removed because it serves nothing
    * -detect-image-hang -restart-when-stalled: helps recover the
      emulator from freezes during execution
    * Disable warning dialog about nested virtualization.

* Terminate the emulator instance if the script expects it to not be
  running, i.e. save time by attempting to terminate and move on with the
  script execution instead of simply failing and doing nothing.

* Add a timeout to the blocking call 'adb wait-for-device'
* Save logcat output to a file for quick access to the logs,
  and put both emulator and logcat files under testresults folder,
  which would them available in cases of failure without needing to
  create a VM for debugging to get the logs.

Task-number: QTQAINFRA-5596
Fixes: QTQAINFRA-4628
Change-Id: I751bbec14980a452e02066f4e79d76fe6f3c018f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-08-01 10:43:42 +03:00
Assam Boudjelthia
f7f7c9f915 COIN/Android: Use -avd param to avoid appending '@' to AVD name
Using -avd emulator param saves us from using the '@' character
at the start of the name (which I didn't do few times, and was
faced with an unresponsive emulator and not immediately seeing
the problem in a debug vm).

Task-number: QTQAINFRA-5596
Change-Id: I3863dc312fd33dae78eeb3dd02f5fb16ca79d72b
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-08-01 10:43:38 +03: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
Qt Submodule Update Bot
38ee3dd2cf Update submodules on 'dev in qt/qt5'
Change-Id: I36e433216a646ed86338f0aa6a748b67cc46d805
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-29 02:33:05 +00:00
Ville-Pekka Karhu
6f24602eb4 Provisioning: Add macOS 14 ARM support
Task-number: QTQAINFRA-5643
Change-Id: Ie98a77063c59033ccffa397aca4dbc349e624450
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-07-28 11:14:26 +03: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
Qt Submodule Update Bot
68318c4636 Update submodules on 'dev in qt/qt5'
Change-Id: Ie766529ec00b837a45d5ba323d50bb9aba6429f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-27 05:26:08 +00: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
8b6151e23d Coin: install specific version of openjdk 11
Android's sdkmanager seems to fail with openjdk 11 version 11.0.20.0.8.
The previous version 11.0.19.0.7 seems to work. the error is failure to
find /usr/lib/jvm/java-11-openjdk-11.0.20.0.8-2.el8.x86_64/lib/tzdb.dat.

This is more of a workaround for now to unblock provisioning.

Change-Id: Ib50b497c6e8b6bffd0739bf665ab1deb5bd51666
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-07-25 15:53:17 +03:00
Allan Sandfeld Jensen
d1552c26a8 Add libva-devel and gbm-devel packages for qtwebengine
Will be needed in Qt 6.6 for VA-API

Pick-to: 6.6
Change-Id: I4389ee03eb85a05f9bce37a0eb4629d30e1aefd1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-07-25 14:53:14 +02:00
Qt Submodule Update Bot
00db7c2cbb Update submodules on 'dev in qt/qt5'
Change-Id: I77972fba7a0dfd34969b79c46d76dcdab719afa9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-25 12:53:10 +00: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
Assam Boudjelthia
8d199fd701 COIN/ANDROID: Move android_emulator_launcher.sh to qt5.git
The android emulator launcher script is mainly used in CI and thus
makes sense to be moved there. This also makes it easier to make changes
without having to wait for submodule updates.

The env var ANDROID_EMULATOR_RUNNER points to the path of the runner
script, and can be used by qtbase.

qt5.git part of the change.

Task-number: QTQAINFRA-5596
Change-Id: If253e0a5f14d67526995561b1859312e61efdfff
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-07-25 15:52:58 +03:00
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
Amir Masoud Abdol
bb13b7dadf Show an error when a submodule is missing, or misspelled
Stop the configuration and show an error if one of the submodules is
missing, or misspelled in `-submodules` option.

Pick-to: 6.5 6.6
Fixes: QTBUG-114133
Change-Id: I890d4f5f0614288a2be422f839e04a0086a58403
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
2023-06-12 12:10:23 +00:00
Qt Submodule Update Bot
0949a55e23 Update submodules on 'dev in qt/qt5'
Change-Id: I1dfefef6938564d83c5aa4ce7717e25b48d6b9dd
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-06-09 12:33:20 +00:00
1432 changed files with 9168 additions and 21192 deletions

View File

@@ -10,10 +10,13 @@
# ==[ Footers: Uncomment and edit where applicable ]===================|
#
# One task per entry. Add a space after the colon.
# Use Fixes to automatically close an issue, and Task-number to
# reference it without further action.
# You do not need both for the same issue.
# Use Fixes to automatically close an issue, Reopens to automatically
# reopen an issue, and Task-number to reference it without further
# action.
# You do not need to include Task-Number where Fixes or Reopens is
# specified for the same issue.
#Fixes:
#Reopens:
#Task-number:
#Coverity-Id:
#

9
.github/pull_request_template.md vendored Normal file
View File

@@ -0,0 +1,9 @@
## Qt contribution guidelines
We welcome contributions to Qt!
Note that all contributions to the Qt project are exclusively handled through the [Gerrit code review system](https://codereview.qt-project.org).
Read the
[Qt Contribution Guidelines](https://wiki.qt.io/Qt_Contribution_Guidelines) to learn more.

6
.gitignore vendored
View File

@@ -2,3 +2,9 @@ Makefile
.qmake.cache
.qmake.super
*.pro.user*
CMakeLists.txt.user*
CMakeUserPresets.json
.vscode
build
build-*
.DS_Store

91
.gitmodules vendored
View File

@@ -1,40 +1,40 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = dev
branch = 6.7.3
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
path = qtdeclarative
url = ../qtdeclarative.git
branch = dev
branch = 6.7.3
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtmultimedia"]
depends = qtbase qtshadertools
recommends = qtdeclarative qtquick3d
path = qtmultimedia
url = ../qtmultimedia.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = dev
branch = 6.7.3
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
@@ -47,7 +47,7 @@
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = dev
branch = 6.7.3
status = essential
priority = 30
[submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia qtshadertools qtwebengine
path = qtdoc
url = ../qtdoc.git
branch = dev
branch = 6.7.3
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -76,21 +76,21 @@
recommends = qtdeclarative
path = qtlocation
url = ../qtlocation.git
branch = dev
branch = 6.7.3
status = preview
[submodule "qtpositioning"]
depends = qtbase
recommends = qtdeclarative qtserialport
path = qtpositioning
url = ../qtpositioning.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -117,61 +117,61 @@
recommends = qtdeclarative
path = qtconnectivity
url = ../qtconnectivity.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtshadertools
recommends = qtdeclarative qtshadertools qtmultimedia
path = qt3d
url = ../qt3d.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtwebchannel qttools qtpositioning
path = qtwebengine
url = ../qtwebengine.git
branch = dev
branch = 6.7.3
status = addon
priority = 10
[submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtgamepad"]
depends = qtbase
@@ -219,27 +219,27 @@
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
depends = qtbase qtmultimedia
recommends = qtdeclarative
path = qtspeech
url = ../qtspeech.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
@@ -252,86 +252,87 @@
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = dev
branch = 6.7.3
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
recommends = qtquicktimeline
path = qtquick3d
url = ../qtquick3d.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools
url = ../qtshadertools.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qt5compat"]
depends = qtbase qtdeclarative
path = qt5compat
url = ../qt5compat.git
branch = dev
branch = 6.7.3
status = deprecated
[submodule "qtcoap"]
depends = qtbase
path = qtcoap
url = ../qtcoap.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtmqtt"]
depends = qtbase qtdeclarative
path = qtmqtt
url = ../qtmqtt.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtopcua"]
depends = qtbase qtdeclarative
path = qtopcua
url = ../qtopcua.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtlanguageserver"]
depends = qtbase
path = qtlanguageserver
url = ../qtlanguageserver.git
branch = dev
branch = 6.7.3
status = preview
[submodule "qthttpserver"]
depends = qtbase
recommends = qtwebsockets
path = qthttpserver
url = ../qthttpserver.git
branch = dev
branch = 6.7.3
status = preview
[submodule "qtquick3dphysics"]
depends = qtbase qtdeclarative qtquick3d qtshadertools
path = qtquick3dphysics
url = ../qtquick3dphysics.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtgrpc"]
depends = qtbase
recommends = qtdeclarative
path = qtgrpc
url = ../qtgrpc.git
branch = dev
branch = 6.7.3
status = preview
[submodule "qtquickeffectmaker"]
depends = qtbase qtdeclarative qtshadertools
recommends = qtquick3d
path = qtquickeffectmaker
url = ../qtquickeffectmaker.git
branch = dev
branch = 6.7.3
status = addon
[submodule "qtgraphs"]
depends = qtbase qtdeclarative qtquick3d
path = qtgraphs
url = ../qtgraphs.git
branch = dev
branch = 6.7.3
status = preview

View File

@@ -2,17 +2,15 @@
# 3.16 is the absolute minimum though.
cmake_minimum_required(VERSION 3.16...3.21)
# set QT_SUPERBUILD early, so that qtbase/.cmake.conf can check it
set(QT_SUPERBUILD TRUE)
# Include qtbase's .cmake.conf for access to QT_REPO_MODULE_VERSION
set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")
include("${__qt6_qtbase_src_path}/.cmake.conf")
include("${__qt6_qtbase_src_path}/cmake/QtBaseTopLevelHelpers.cmake")
# Run platform auto-detection /before/ the first project() call and thus
# before the toolchain file is loaded.
include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
qt_internal_top_level_setup_autodetect()
project(Qt
VERSION "${QT_REPO_MODULE_VERSION}"
@@ -21,38 +19,47 @@ project(Qt
LANGUAGES CXX C ASM
)
# Required so we can call ctest from the root build directory
enable_testing()
set(qt_module_prop_prefix "__qt_prop_")
qt_internal_top_level_setup_after_project()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
if (NOT QT_BUILD_STANDALONE_TESTS)
list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake")
list(APPEND CMAKE_MODULE_PATH
"${__qt6_qtbase_src_path}/cmake/3rdparty/extra-cmake-modules/find-modules")
list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin")
endif()
qt_internal_top_level_setup_cmake_module_path()
include(QtTopLevelHelpers)
include(ECMOptionalAddSubdirectory)
# Also make sure the CMake config files do not recreate the already-existing targets
if (NOT QT_BUILD_STANDALONE_TESTS)
set(QT_NO_CREATE_TARGETS TRUE)
endif()
qt_internal_top_level_before_build_submodules()
qt_internal_find_modules(known_submodules)
# Get submodule list if not already defined
if(NOT QT_BUILD_SUBMODULES)
if(DEFINED ENV{QT_BUILD_SUBMODULES})
set(QT_BUILD_SUBMODULES "$ENV{QT_BUILD_SUBMODULES}")
else()
qt_internal_find_modules(QT_BUILD_SUBMODULES)
set(QT_BUILD_SUBMODULES "${known_submodules}")
endif()
endif()
set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build")
qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES)
# Preliminary check if module should be skipped since -skip <module> or BUILD_<module>
# are provided.
set(explicitly_skipped_modules "")
foreach(module IN LISTS known_submodules)
if(DEFINED BUILD_${module} AND NOT BUILD_${module})
list(APPEND explicitly_skipped_modules ${module})
endif()
endforeach()
foreach(module IN LISTS QT_BUILD_SUBMODULES)
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${module}/CMakeLists.txt)
message(FATAL_ERROR
"Module '${module}' cannot be found. Please double-check the "
"spelling and try again. Or run `./init-repository` to get "
"the submodules.")
endif()
endforeach()
qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES
SKIP_MODULES ${explicitly_skipped_modules})
foreach(module IN LISTS QT_BUILD_SUBMODULES)
# Check for unmet dependencies
@@ -100,18 +107,7 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES)
message(STATUS "Configuring submodule '${module}'")
ecm_optional_add_subdirectory("${module}")
if(module STREQUAL "qtbase")
if (NOT QT_BUILD_STANDALONE_TESTS)
list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/${INSTALL_LIBDIR}/cmake")
list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
endif()
endif()
qt_internal_top_level_after_add_subdirectory()
endforeach()
if(NOT QT_BUILD_STANDALONE_TESTS)
# Display a summary of everything
include(QtBuildInformation)
include(QtPlatformSupport)
qt_print_feature_summary()
qt_print_build_instructions()
endif()
qt_internal_top_level_end()

8
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,8 @@
## Qt contribution guidelines
We welcome contributions to Qt!
Note that we cannot accept pull requests on GitHub. All contributions to the Qt project are exclusively handled through the [Gerrit code review system](https://codereview.qt-project.org).
Read the
[Qt Contribution Guidelines](https://wiki.qt.io/Qt_Contribution_Guidelines) to learn more.

View File

@@ -1,704 +0,0 @@
This is the GNU General Public License version 3, annotated with The
Qt Company GPL Exception 1.0:
-------------------------------------------------------------------------
The Qt Company GPL Exception 1.0
Exception 1:
As a special exception you may create a larger work which contains the
output of this application and distribute that work under terms of your
choice, so long as the work is not otherwise derived from or based on
this application and so long as the work does not in itself generate
output that contains the output from this application in its original
or modified form.
Exception 2:
As a special exception, you have permission to combine this application
with Plugins licensed under the terms of your choice, to produce an
executable, and to copy and distribute the resulting executable under
the terms of your choice. However, the executable must be accompanied
by a prominent notice offering all users of the executable the entire
source code to this application, excluding the source code of the
independent modules, but including any changes you have made to this
application, under the terms of this license.
-------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,8 @@
Licensees holding valid commercial Qt licenses may use this software in
accordance with the the terms contained in a written agreement between
you and The Qt Company. Alternatively, the terms and conditions that were
accepted by the licensee when buying and/or downloading the
software do apply.
For the latest licensing terms and conditions, see https://www.qt.io/terms-conditions.
For further information use the contact form at https://www.qt.io/contact-us.

View File

@@ -0,0 +1,22 @@
The Qt Company GPL Exception 1.0
Exception 1:
As a special exception you may create a larger work which contains the
output of this application and distribute that work under terms of your
choice, so long as the work is not otherwise derived from or based on
this application and so long as the work does not in itself generate
output that contains the output from this application in its original
or modified form.
Exception 2:
As a special exception, you have permission to combine this application
with Plugins licensed under the terms of your choice, to produce an
executable, and to copy and distribute the resulting executable under
the terms of your choice. However, the executable must be accompanied
by a prominent notice offering all users of the executable the entire
source code to this application, excluding the source code of the
independent modules, but including any changes you have made to this
application, under the terms of this license.

View File

@@ -9,8 +9,8 @@ System requirements
-------------------
* C++ compiler supporting the C++17 standard
* CMake 3.16 or newer
* Ninja 1.8 or newer
* CMake
* Ninja
* Python 3
For more details, see also https://doc.qt.io/qt-6/build-sources.html
@@ -29,7 +29,7 @@ Windows:
1. Open a command prompt.
2. Ensure that the following tools can be found in the path:
* Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 8.1 or later)
* Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 11.2 or later)
* Python 3 ([https://www.python.org/downloads/windows/] or from Microsoft Store)
```

39
README.md.template Normal file
View File

@@ -0,0 +1,39 @@
## Qt Package/Repository Name
### Package Brief
### Documentation
The documentation can be found in the following places:
* The online Qt documentation:
* [<Qt module> documentation](https://doc.qt.io/qt-6/<qtmodule>-index.html)
* Build from source:
* [Building Qt Documentation](https://wiki.qt.io/Building_Qt_Documentation)
*Note that the documentation links in this document will always be for the
latest Qt 6 version. If you need to browse the documentation for a specific
version, you can [browse the archives](https://doc.qt.io/archives/).*
### Build Process
Building the package/repository does depend on the Qt packages listed in dependencies.yaml.
Further dependencies to system packages are listed in the configure output.
See the [documentation](https://doc.qt.io/qt-6/build-sources.html) for general
advice on building the Qt framework and its modules from sources. Further
information on how to build from source is also available in the
[wiki](https://wiki.qt.io/Building_Qt_6_from_Git).
### Report an Issue
If you spot a bug, follow [these](https://doc.qt.io/qt-6/bughowto.html)
steps to report it.
### Contribute to Qt
We welcome contributions to Qt! If you'd like to contribute, read the
[Qt Contribution Guidelines](https://wiki.qt.io/Qt_Contribution_Guidelines).
### Licensing
Qt is available under various licenses. For details, check out the
[license documentation](https://doc.qt.io/qt-6/licensing.html).
*Note that this README.md.template serves as a guideline for README.md files,
and that further sections can be added to individual README.md files if
necessary.*

View File

@@ -28,8 +28,8 @@ CommentPragmas: "^!|^:|^ SPDX-License-Identifier:"
# We want a space between the type and the star for pointer types.
PointerBindsToType: false
# We use template< without space.
SpaceAfterTemplateKeyword: false
# We generally use "template <" with space.
SpaceAfterTemplateKeyword: true
# We want to break before the operators, but not before a '='.
BreakBeforeBinaryOperators: NonAssignment
@@ -106,3 +106,9 @@ AlignEscapedNewlines: Left
# initializer list in list-initialization.
SpaceBeforeCpp11BracedList: false
---
# Use the Google-based style for .proto files.
Language: Proto
BasedOnStyle: Google
IndentWidth: 4
ColumnLimit: 100

View File

@@ -0,0 +1,13 @@
# The script produces the list of qt submodules that are required to build the submodules listed
# in the QT_BUILD_SUBMODULES variable. The resulting list preserves the required build order.
# Usage:
# cmake [-DQT_BUILD_SUBMODULES="<repo;..>"] [-BUILD_<repo>=<TRUE|FALSE>] \
# -P <path/to>/qt6/cmake/QtSortModuleDependencies.cmake
cmake_minimum_required(VERSION 3.16)
include(${CMAKE_CURRENT_LIST_DIR}/QtTopLevelHelpers.cmake)
qt_internal_collect_modules_only(result "${QT_BUILD_SUBMODULES}")
list(JOIN result " " result)
message("${result}")

View File

@@ -111,10 +111,12 @@ endfunction()
#
# NORMALIZE_REPO_NAME_IF_NEEDED Will remove 'tqtc-' from the beginning of submodule dependencies
# if a tqtc- named directory does not exist.
#
# SKIP_MODULES Modules that should be skipped from evaluation completely.
function(qt_internal_resolve_module_dependencies module out_ordered out_revisions)
set(options IN_RECURSION NORMALIZE_REPO_NAME_IF_NEEDED)
set(oneValueArgs REVISION SKIPPED_VAR)
set(multiValueArgs PARSED_DEPENDENCIES)
set(multiValueArgs PARSED_DEPENDENCIES SKIP_MODULES)
cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
# Clear the property that stores the repositories we've already seen.
@@ -122,10 +124,10 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
set_property(GLOBAL PROPERTY _qt_internal_seen_repos)
endif()
# Bail out if we've seen the module already.
# Bail out if we've seen the module already or it was skipped explicitly from command line.
qt_internal_resolve_module_dependencies_set_skipped(FALSE)
get_property(seen GLOBAL PROPERTY _qt_internal_seen_repos)
if(module IN_LIST seen)
if(module IN_LIST seen OR module IN_LIST arg_SKIP_MODULES)
qt_internal_resolve_module_dependencies_set_skipped(TRUE)
return()
endif()
@@ -171,11 +173,17 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
set_property(GLOBAL APPEND PROPERTY QT_REQUIRED_DEPS_FOR_${module} ${dependency})
endif()
set(extra_options "")
if(arg_SKIP_MODULES)
list(APPEND extra_options SKIP_MODULES ${arg_SKIP_MODULES})
endif()
qt_internal_resolve_module_dependencies(${dependency} dep_ordered dep_revisions
REVISION "${revision}"
SKIPPED_VAR skipped
IN_RECURSION
${normalize_arg}
${extra_options}
)
if(NOT skipped)
list(APPEND ordered ${dep_ordered})
@@ -198,8 +206,14 @@ endfunction()
# modules is the initial list of repos.
# out_all_ordered is the variable name where the result is stored.
#
# SKIP_MODULES Modules that should be skipped from evaluation completely.
#
# See qt_internal_resolve_module_dependencies for side effects.
function(qt_internal_sort_module_dependencies modules out_all_ordered)
set(options "")
set(oneValueArgs "")
set(multiValueArgs SKIP_MODULES)
cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
# Create a fake repository "all_selected_repos" that has all repositories from the input as
# required dependency. The format must match what qt_internal_parse_dependencies produces.
@@ -208,9 +222,15 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered)
list(APPEND all_selected_repos_as_parsed_dependencies "${module}/HEAD/FALSE")
endforeach()
set(extra_args "")
if(arg_SKIP_MODULES)
set(extra_args SKIP_MODULES ${arg_SKIP_MODULES})
endif()
qt_internal_resolve_module_dependencies(all_selected_repos ordered unused_revisions
PARSED_DEPENDENCIES ${all_selected_repos_as_parsed_dependencies}
NORMALIZE_REPO_NAME_IF_NEEDED
${extra_args}
)
# Drop "all_selected_repos" from the output. It depends on all selected repos, thus it must be
@@ -505,3 +525,41 @@ function(qt_internal_foreach_repo_run)
)
message("Successes: ${count_success}")
endfunction()
# The function collects repos and dependencies that are required to build
# repos listed in ARGN. If the BUILD_<repo> is defined the 'repo' will be
# excluded from the list.
function(qt_internal_collect_modules_only out_repos)
set(initial_modules "${ARGN}")
get_filename_component(qt5_repo_dir "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
# Overriding CMAKE_CURRENT_SOURCE_DIR is ugly but works
set(CMAKE_CURRENT_SOURCE_DIR "${qt5_repo_dir}")
if(NOT initial_modules)
qt_internal_find_modules(initial_modules)
endif()
qt_internal_sort_module_dependencies("${initial_modules}" ${out_repos})
foreach(module IN LISTS ${out_repos})
# Check for unmet dependencies
if(DEFINED BUILD_${module} AND NOT BUILD_${module})
list(REMOVE_ITEM ${out_repos} ${module})
continue()
endif()
get_property(required_deps GLOBAL PROPERTY QT_REQUIRED_DEPS_FOR_${module})
get_property(dependencies GLOBAL PROPERTY QT_DEPS_FOR_${module})
foreach(dep IN LISTS dependencies)
set(required FALSE)
if(dep IN_LIST required_deps)
set(required TRUE)
endif()
if(required AND DEFINED BUILD_${dep} AND NOT BUILD_${dep})
set(BUILD_${module} FALSE)
list(REMOVE_ITEM ${out_repos} ${module})
break()
endif()
endforeach()
endforeach()
set(${out_repos} "${${out_repos}}" PARENT_SCOPE)
endfunction()

View File

@@ -1,10 +0,0 @@
[settings]
os=Android
os.api_level=8
arch=armv8
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
*:shared=True

View File

@@ -1,10 +0,0 @@
[settings]
os=Android
os.api_level=8
arch=armv7
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
*:shared=True

View File

@@ -1,10 +0,0 @@
[settings]
os=Android
os.api_level=8
arch=x86
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
*:shared=True

View File

@@ -1,10 +0,0 @@
[settings]
os=Android
os.api_level=8
arch=x86_64
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
*:shared=True

View File

@@ -1,9 +0,0 @@
[settings]
os=Emscripten
arch=wasm
compiler=clang
compiler.version=10
compiler.libcxx=libstdc++
build_type=Release
[options]
*:shared=False

View File

@@ -1,9 +0,0 @@
[settings]
os=Linux
arch=x86_64
compiler=gcc
compiler.version=9.3
compiler.libcxx=libstdc++11
build_type=RelWithDebInfo
[options]
*:shared=True

View File

@@ -1,9 +0,0 @@
[settings]
os=Linux
arch=x86_64
compiler=gcc
compiler.version=9.3
compiler.libcxx=libstdc++11
build_type=Debug
[options]
*:shared=True

View File

@@ -1,10 +0,0 @@
[settings]
os=iOS
os.version=13.0
arch=armv8
compiler=apple-clang
compiler.version=11.0
compiler.libcxx=libc++
build_type=Release
[options]
*:shared=False

View File

@@ -1,10 +0,0 @@
[settings]
os=Macos
os.version=11.0
arch=x86_64
compiler=apple-clang
compiler.version=12.0
compiler.libcxx=libc++
build_type=RelWithDebInfo
[options]
*:shared=True

View File

@@ -1,9 +0,0 @@
[settings]
os=Emscripten
arch=wasm
compiler=clang
compiler.version=10
compiler.libcxx=libstdc++
build_type=Release
[options]
*:shared=False

View File

@@ -1,11 +0,0 @@
[settings]
os=Windows
arch=armv8
compiler=msvc
compiler.version=19.28
compiler.cppstd=17
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release
[options]
*:shared=True

View File

@@ -1,9 +0,0 @@
[settings]
os=Emscripten
arch=wasm
compiler=clang
compiler.version=10
compiler.libcxx=libstdc++
build_type=RelWithDebInfo
[options]
*:shared=False

View File

@@ -1,9 +0,0 @@
[settings]
os=Windows
arch=x86_64
compiler=gcc
compiler.version=11
compiler.libcxx=libstdc++
build_type=RelWithDebInfo
[options]
*:shared=True

View File

@@ -1,11 +0,0 @@
[settings]
os=Windows
arch=x86_64
compiler=msvc
compiler.version=19.28
compiler.cppstd=17
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=RelWithDebInfo
[options]
*:shared=True

View File

@@ -1,11 +0,0 @@
[settings]
os=Windows
arch=x86_64
compiler=msvc
compiler.version=19.28
compiler.cppstd=17
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=RelWithDebInfo
[options]
*:shared=True

View File

@@ -1,5 +0,0 @@
include(./linux-webassembly-x86_64-clang)
[options]
qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,6 +0,0 @@
include(./linux-x86_64-gcc)
[options]
qtbase:headersclean=True
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./linux-x86_64-gcc-debug-developer)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1 +0,0 @@
include(./macos-ios-arm64-clang)

View File

@@ -1,6 +0,0 @@
include(./macos-universal-clang)
[options]
qtbase:headersclean=True
qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT=$POSTGRESQLBINPATH/..'
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./macos-webassembly-x86_64-clang)
[options]
qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./android-arm64-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./android-armv7-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./android-x86-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./android-x86_64-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./android-arm64-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./android-armv7-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./android-x86-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./android-x86_64-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,4 +0,0 @@
include(./windows-arm64-msvc2019_64)
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_msvc_obj_debug_info=ON"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,5 +0,0 @@
include(./windows-webassembly-x86_64-clang)
[options]
qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,6 +0,0 @@
include(./windows-x86_64-mingw)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT=%POSTGRESQL_LIB_x64%\.."
*:cmake_args_leaf_module="-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,7 +0,0 @@
include(./windows-x86_64-msvc2019_64)
[options]
qtbase:headersclean=True
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DPostgreSQL_ROOT=%POSTGRESQL_LIB_x64%\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,7 +0,0 @@
include(./windows-x86_64-msvc2019_64-developer)
[options]
qtbase:headersclean=True
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -1,11 +0,0 @@
include(baseprofiles/linux-webassembly-x86_64-clang)
[options]
qtbase:release=True
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:nomake=examples;tests
qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,19 +0,0 @@
include(baseprofiles/linux-x86_64-gcc)
[options]
qtbase:release=True
qtbase:nomake=tests;examples
qtbase:separate_debug_info=True
qtbase:force_debug_info=True
qtbase:bundled_xcb_xinput=True
qtbase:libudev=False
qtbase:doubleconversion=qt
qtbase:pcre=qt
qtbase:libjpeg=qt
qtbase:libpng=qt
qtbase:icu=True
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,11 +0,0 @@
include(baseprofiles/linux-x86_64-gcc-debug-developer)
[options]
qtbase:debug=True
qtbase:nomake=tests;examples
qtbase:developer_build=True
qtbase:cmake_args_qtbase=""
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,11 +0,0 @@
include(baseprofiles/macos-ios-arm64-clang)
[options]
qtbase:debug_and_release=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_SYSTEM_NAME=iOS"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,13 +0,0 @@
include(baseprofiles/macos-universal-clang)
[options]
qtbase:release=True
qtbase:nomake=examples;tests
qtbase:force_debug_info=True
qtbase:separate_debug_info=True
qtbase:framework=True
qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DODBC_ROOT=/usr/local/opt/libiodbc'
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,11 +0,0 @@
include(baseprofiles/macos-webassembly-x86_64-clang)
[options]
qtbase:release=True
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:nomake=examples;tests
qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,16 +0,0 @@
include(baseprofiles/unix-android-arm64-clang)
[options]
qtbase:release=True
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang
qtbase:android_abis=arm64-v8a
qtbase:android_ndk=$ANDROID_NDK_ROOT
qtbase:android_sdk=$ANDROID_SDK_ROOT
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,16 +0,0 @@
include(baseprofiles/unix-android-armv7-clang)
[options]
qtbase:release=True
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang
qtbase:android_abis=armeabi-v7a
qtbase:android_ndk=$ANDROID_NDK_ROOT
qtbase:android_sdk=$ANDROID_SDK_ROOT
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,16 +0,0 @@
include(baseprofiles/unix-android-x86-clang)
[options]
qtbase:release=True
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang
qtbase:android_abis=x86
qtbase:android_ndk=$ANDROID_NDK_ROOT
qtbase:android_sdk=$ANDROID_SDK_ROOT
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,16 +0,0 @@
include(baseprofiles/unix-android-x86_64-clang)
[options]
qtbase:release=True
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang
qtbase:android_abis=x86_64
qtbase:android_ndk=$ANDROID_NDK_ROOT
qtbase:android_sdk=$ANDROID_SDK_ROOT
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,17 +0,0 @@
include(baseprofiles/windows-android-arm64-clang)
[options]
qtbase:release=True
qtbase:pkg_config=False
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang
qtbase:android_abis=arm64-v8a
qtbase:android_ndk=%ANDROID_NDK_ROOT%
qtbase:android_sdk=%ANDROID_SDK_ROOT%
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,17 +0,0 @@
include(baseprofiles/windows-android-armv7-clang)
[options]
qtbase:release=True
qtbase:pkg_config=False
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang
qtbase:android_abis=armeabi-v7a
qtbase:android_ndk=%ANDROID_NDK_ROOT%
qtbase:android_sdk=%ANDROID_SDK_ROOT%
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,17 +0,0 @@
include(baseprofiles/windows-android-x86-clang)
[options]
qtbase:release=True
qtbase:pkg_config=False
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang
qtbase:android_abis=x86
qtbase:android_ndk=%ANDROID_NDK_ROOT%
qtbase:android_sdk=%ANDROID_SDK_ROOT%
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,17 +0,0 @@
include(baseprofiles/windows-android-x86_64-clang)
[options]
qtbase:release=True
qtbase:pkg_config=False
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang
qtbase:android_abis=x86_64
qtbase:android_ndk=%ANDROID_NDK_ROOT%
qtbase:android_sdk=%ANDROID_SDK_ROOT%
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,11 +0,0 @@
include(baseprofiles/windows-arm64-msvc2019_64)
[options]
qtbase:release=True
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:nomake=tests
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DFEATURE_msvc_obj_debug_info=ON"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,12 +0,0 @@
include(baseprofiles/windows-webassembly-x86_64-clang)
[options]
qtbase:release=True
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:nomake=examples;tests
qtbase:force_debug_info=True
qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
*:cmake_args_leaf_module="-DFEATURE_pkg_config=OFF"
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,15 +0,0 @@
include(baseprofiles/windows-x86_64-mingw)
[options]
qtbase:release=True
qtbase:force_debug_info=True
qtbase:separate_debug_info=True
qtbase:nomake=examples;tests
qtbase:zlib=qt
qtbase:libjpeg=qt
qtbase:freetype=qt
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++"
*:cmake_args_leaf_module="-DFEATURE_system_tiff=OFF"
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,13 +0,0 @@
include(baseprofiles/windows-x86_64-msvc2019_64)
[options]
qtbase:nomake=tests
qtbase:debug_and_release=True
qtbase:force_debug_info=True
qtbase:zlib=None
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,14 +0,0 @@
include(baseprofiles/windows-x86_64-msvc2019_64-developer)
[options]
qtbase:nomake=tests
qtbase:debug_and_release=True
qtbase:force_debug_info=True
qtbase:developer_build=True
qtbase:headersclean=True
qtbase:make=examples
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_system_zlib=OFF"
*:cmake_args_leaf_module="-DFEATURE_system_zlib=OFF"
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,14 +1,12 @@
Version: 2
Configurations:
-
Id: 'opensuse-15.4-host-asan'
Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
Id: 'opensuse-15.5-host-asan'
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Compiler: 'GCC'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]

View File

@@ -0,0 +1,4 @@
Version: 2
Module only: True
Include: [yocto.yaml]
Configurations: []

View File

@@ -2,6 +2,7 @@ Version: 2
Include: [
cmake_platforms_qemu.yaml,
cmake_platforms_qemu_qnx710.yaml,
cmake_platforms_qemu_vxworks.yaml,
cmake_platforms_target_android.yaml,
cmake_platforms_wasm.yaml,
macos.yaml
@@ -12,8 +13,8 @@ Configurations:
Id: 'ubuntu-22.04-documentation'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure', 'DoNotRunTests']
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests']
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
-
Id: 'ubuntu-22.04'
@@ -30,7 +31,7 @@ Configurations:
Id: 'ubuntu-22.04-documentation-x11-tests'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'TestOnly']
Features: ['Sccache', 'TestDocs', 'TestOnly']
Platform dependency: 'ubuntu-22.04-documentation'
-
Id: 'ubuntu-22.04-x11-tests'
@@ -39,20 +40,19 @@ Configurations:
Features: ['Sccache', 'TestOnly']
Platform dependency: 'ubuntu-22.04'
-
Id: 'opensuse-15.4-developer-build'
Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
Id: 'opensuse-15.5-developer-build'
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Compiler: 'GCC'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
-
Id: 'sles-15_sp4-static'
Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
Id: 'sles-15_sp5-static'
Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests', 'UseConfigure']
Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -62,73 +62,43 @@ Configurations:
]
-
Id: 'windows-10_22h2-msvc2019'
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-11_22h2-msvc2019'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
Id: 'windows-11_23H2-msvc2022'
Template: 'qtci-windows-11_23H2-x86_64-53'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-10_22h2-msvc2022'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-11_22h2-msvc2022'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-10_22h2-msvc2019-developer-build'
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-10_22h2-msvc2019-arm64'
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
@@ -136,155 +106,128 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-11_22h2-msvc2019-developer-build'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-11_22h2-msvc2019-arm64'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
Platform dependency: 'windows-11_22h2-msvc2019-developer-build'
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'rhel-8.6'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Id: 'rhel-8.8'
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF'
]
-
Id: 'rhel-9.0'
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Id: 'rhel-9.2'
Template: 'qtci-linux-RHEL-9.2-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies']
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
# Build on Debian-11.6 and split test on Wayland and offscreen later
-
Id: 'debian-11.6-arm64'
Template: 'qtci-linux-Debian-11.6-aarch64-50'
Compiler: 'GCC'
Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput'
Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
]
# Test on Debian-11.6 offscreen
-
Id: 'debian-11.6-arm64-offscreen-tests'
Template: 'qtci-linux-Debian-11.6-aarch64-50'
Compiler: 'GCC'
Features: ['Sccache', 'InsignificantTests', 'TestOnly']
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'QT_QPA_PLATFORM=offscreen'
]
Platform dependency: 'debian-11.6-arm64'
-
Id: 'ios-universal'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-13-x86_64-103'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-universal-on-x86_64'
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
]
-
Id: 'windows-10_22h2-mingw11'
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'Mingw'
Features: ['Packaging', 'Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
]
-
Id: 'windows-10_22h2-llvm'
Template: 'qtci-windows-10_22H2-x86_64-50'
Id: 'windows-11_23H2-llvm'
Template: 'qtci-windows-11_23H2-x86_64-53'
Compiler: 'Clang'
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
Features: ['Packaging','Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
Environment variables: [
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
'LLVM_INSTALL_DIR=C:\llvm-mingw',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_llvm_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
]
-
Id: 'windows-11_22h2-llvm'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'Clang'
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
'LLVM_INSTALL_DIR=C:\llvm-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
]
-
Id: 'windows-10_22h2-mingw11-developer-build'
Template: 'qtci-windows-10_22H2-x86_64-50'
Id: 'windows-11_23H2-mingw11-developer-build'
Template: 'qtci-windows-11_23H2-x86_64-53'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
]
-
Id: 'windows-11_22h2-mingw11-developer-build'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
Id: 'jammy-arm64-debian-pkg-packaging'
Template: 'qtci-linux-Debian-11.6-aarch64-50'
Compiler: 'GCC'
Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
'DEBIAN_RULES_REF=6.7_dev',
'COIN_TARGET_DIST=tqtc-jammy',
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
'COIN_SBUILD_CHROOT=jammy-arm64-sbuild',
'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ jammy main universe multiverse',
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
]
-
Id: 'jammy-amd64-debian-pkg-packaging'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
Environment variables: [
'DEBIAN_RULES_REF=6.7_dev',
'COIN_TARGET_DIST=tqtc-jammy',
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
'COIN_SBUILD_CHROOT=jammy-amd64-sbuild',
'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
]

View File

@@ -12,7 +12,7 @@ Configurations:
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
"QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',
@@ -29,7 +29,7 @@ Configurations:
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
"QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',
@@ -46,7 +46,7 @@ Configurations:
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
"QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',

View File

@@ -12,8 +12,9 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'QT_CMAKE_DIR=/opt/cmake-3.24.2/bin',
'QT_CMAKE_DIR=/opt/cmake-3.27.7/bin',
'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
]
-
Id: 'qnx-710-arm64-on-linux'
@@ -27,6 +28,7 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
]
-
Id: 'qnx-710-armv7-on-linux'
@@ -40,4 +42,5 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
]

View File

@@ -0,0 +1,15 @@
Version: 2
Configurations:
-
Id: 'vxworks-imx6'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'VxWorks'
Target arch: 'ARMv7'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'ubuntu-22.04'
Features: ['Packaging', 'VMSize8', 'UseConfigure', 'Insignificant', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -developer-build -force-debug-info -qpa eglfs -nomake examples',
'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
]

View File

@@ -1,8 +1,8 @@
Version: 2
Configurations:
-
Id: 'sles-15_sp4-minimal-static'
Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
Id: 'sles-15_sp5-minimal-static'
Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -11,7 +11,7 @@ Configurations:
]
-
Id: 'windows-10_22h2-minimal-static'
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'

View File

@@ -2,72 +2,64 @@ Version: 2
Configurations:
-
Id: 'android-arm64-on-macos'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-13-x86_64-103'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-universal-on-x86_64'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}}',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
Id: 'android-armv7-on-windows'
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'windows-10_22h2-mingw11'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}}',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
Id: 'android-6-x86-on-linux'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Id: 'android-8-x86-on-linux'
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.6'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Platform dependency: 'rhel-8.8'
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
'ANDROID_EMULATOR=@emulator_x86_api_23',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
'ANDROID_EMULATOR=emulator_x86_api_26'
]
-
Id: 'android-13-x86_64-on-linux'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Id: 'android-14-x86_64-on-linux'
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.6'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Platform dependency: 'rhel-8.8'
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
'ANDROID_EMULATOR=@emulator_x86_64_api_33'
'ANDROID_EMULATOR=emulator_x86_64_api_34'
]

View File

@@ -2,11 +2,11 @@ Version: 2
Configurations:
-
Id: 'webassembly-linux-thread-asyncify'
Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'opensuse-15.4-developer-build'
Features: ['Sccache', 'DisableTests', 'UseConfigure']
Platform dependency: 'opensuse-15.5-developer-build'
Features: ['Sccache', 'DoNotRunTests', 'UseConfigure']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
"TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
@@ -14,7 +14,7 @@ Configurations:
]
-
Id: 'webassembly-windows'
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Target os: 'WebAssembly'
Compiler: 'Mingw'
Target compiler: 'Clang'
@@ -25,21 +25,18 @@ Configurations:
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include',
]
-
Id: 'webassembly-macos-thread'
Template: 'qtci-macos-12-x86_64-106'
Id: 'webassembly-linux-thread'
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Target os: 'WebAssembly'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-universal-on-x86_64'
Compiler: 'GCC'
Platform dependency: 'opensuse-15.5-developer-build'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
]

View File

@@ -7,7 +7,7 @@ Configurations:
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
@@ -18,13 +18,13 @@ Configurations:
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
-
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
-
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'

View File

@@ -2,18 +2,16 @@ Version: 2
Configurations:
-
Id: 'android-x86-developer-build-testrun-on-linux'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.6'
Platform dependency: 'rhel-8.8'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_INSTALL_DIR={{.InstallDir}}/target',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
'ANDROID_EMULATOR=@emulator_x86_api_23']
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
'ANDROID_EMULATOR=emulator_x86_api_26']

View File

@@ -1,26 +1,28 @@
Version: 2
Configurations:
-
Id: 'rhel_8.4_android_multi'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Id: 'rhel_8.8_android_multi'
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: [
'rhel-8.6',
'android-6-x86-on-linux',
'android-13-x86_64-on-linux'
'rhel-8.8',
'android-8-x86-on-linux',
'android-14-x86_64-on-linux'
]
Features: [
'Sccache',
'WarningsAreErrors',
'AndroidTestRun',
'MinimalAndroidMultiABITests',
'InstallDepsPerPlatformSubdir'
]
Environment variables: [
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.6',
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux',
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux',
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"'
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8',
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-8-x86-on-linux',
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux',
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
'ANDROID_EMULATOR=emulator_x86_api_26'
]

View File

@@ -9,21 +9,20 @@ Configurations:
-
Id: 'macos-universal-on-x86_64'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-13-x86_64-103'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
]
-
Id: 'macos-universal-on-arm64'
Template: 'qtci-macos-12-arm64'
Template: 'qtci-macos-13-arm64'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -31,46 +30,66 @@ Configurations:
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
]
# Test on all supported macOS versions (deployment targets)
# On x86_64
-
Id: 'macos-11-x86_64-tests'
Template: 'qtci-macos-11-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-11-arm64-tests'
Template: 'qtci-macos-11.0-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-12-arm64-tests'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-13-arm64-tests'
Template: 'qtci-macos-13-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-12-x86_64-tests'
Template: 'qtci-macos-12-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-13-x86_64-tests'
Template: 'qtci-macos-13-x86_64-103'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-14-x86_64-tests'
Template: 'qtci-macos-14-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
# And arm64
-
Id: 'macos-12-arm64-tests'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-13-arm64-tests'
Template: 'qtci-macos-13-arm64'
Compiler: 'Clang'
Features: ['TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-14-arm64-tests'
Template: 'qtci-macos-14-arm-106'
Compiler: 'Clang'
Features: ['TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
# Test the universal packaging built on arm64
-
Id: 'macos-12-arm-on-arm64-tests'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Features: ['TestOnly']
Platform dependency: 'macos-universal-on-arm64'
-
Id: 'macos-12-arm-on-x86_64-tests'
@@ -78,6 +97,18 @@ Configurations:
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-universal-on-arm64'
-
Id: 'macos-13-arm-on-x86_64-tests'
Template: 'qtci-macos-13-x86_64-103'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-universal-on-arm64'
-
Id: 'macos-14-arm-on-x86_64-tests'
Template: 'qtci-macos-14-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-universal-on-arm64'
# =========================================================================
# Developer build. Single architecture builds.
@@ -86,58 +117,51 @@ Configurations:
# Build on recent macOS version with latest Xcode
-
Id: 'macos-12-x86_64-developer-build'
Template: 'qtci-macos-12-x86_64-106'
Id: 'macos-13-x86_64-developer-build'
Template: 'qtci-macos-13-x86_64-103'
Compiler: 'Clang'
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
]
-
Id: 'macos-12-arm64-developer-build'
Template: 'qtci-macos-12-arm64'
Id: 'macos-13-arm64-developer-build'
Template: 'qtci-macos-13-arm64'
Compiler: 'Clang'
Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
]
# Note: We do not include OpenSSL or PostgreSQL in this build,
# as the M1 CI machines are not provisioned for that yet.
# Test on all supported macOS versions (deployment targets)
-
Id: 'macos-11-x86_64-developer-build-tests'
Template: 'qtci-macos-11-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-12-x86_64-developer-build'
-
Id: 'macos-11-arm64-developer-build-tests'
Template: 'qtci-macos-11.0-arm64'
Compiler: 'Clang'
Features: ['TestOnly']
Platform dependency: 'macos-12-arm64-developer-build'
-
Id: 'macos-12-x86_64-developer-build-tests'
Template: 'qtci-macos-12-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-12-x86_64-developer-build'
Platform dependency: 'macos-13-arm64-developer-build'
-
Id: 'macos-12-arm64-developer-build-tests'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['TestOnly']
Platform dependency: 'macos-12-arm64-developer-build'
Platform dependency: 'macos-13-arm64-developer-build'
-
Id: 'macos-13-arm64-developer-build-tests'
Template: 'qtci-macos-13-arm64'
Compiler: 'Clang'
Features: ['TestOnly']
Platform dependency: 'macos-12-arm64-developer-build'
Platform dependency: 'macos-13-arm64-developer-build'
-
Id: 'macos-14-arm64-developer-build-tests'
Template: 'qtci-macos-14-arm-106'
Compiler: 'Clang'
Features: ['TestOnly']
Platform dependency: 'macos-13-arm64-developer-build'

View File

@@ -0,0 +1,4 @@
Version: 2
Module only: True
Include: [yocto.yaml]
Configurations: []

View File

@@ -0,0 +1,4 @@
Version: 2
Module only: True
Include: [yocto.yaml]
Configurations: []

View File

@@ -0,0 +1,4 @@
Version: 2
Module only: True
Include: [yocto.yaml]
Configurations: []

View File

@@ -1,14 +0,0 @@
Version: 2
Module only: True
Include: [
macos.yaml: [
"macos-12-x86_64-developer-build"
]
]
Configurations:
-
Id: 'macos-13-x86_64-developer-build-tests'
Template: 'qtci-macos-13-x86_64-103'
Compiler: 'Clang'
Features: ['TestOnly']
Platform dependency: 'macos-12-x86_64-developer-build'

View File

@@ -0,0 +1,20 @@
Version: 2
Module only: True
Configurations:
-
Id: 'macos-14-arm64-developer-build'
Template: 'qtci-macos-14-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
]
-
Id: 'macos-14-arm64-developer-build-tests'
Template: 'qtci-macos-14-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-14-arm64-developer-build'

View File

@@ -7,7 +7,7 @@ Include: [
Configurations:
-
Id: 'qnx-710-arm64-on-windows'
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Target os: 'QNX_710'
Target arch: 'arm64'
Compiler: 'MSVC2019'
@@ -16,6 +16,6 @@ Configurations:
Features: ['DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_LIBRARY_PATH={{.Env.QNX_710}}\target\qnx7\aarch64le\lib;{{.Env.QNX_710}}\target\qnx7\aarch64le\usr\lib -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON'
]

View File

@@ -9,5 +9,5 @@ Configurations:
Configure arguments: '-nomake examples -release -c++std c++17 -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_clangcpp=OFF'
]

View File

@@ -5,7 +5,7 @@ Configurations:
Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
Configure arguments: '-make examples -developer-build -c++std c++20 -qtlibinfix TestInfix -qtnamespace TestNamespace'
-
Id: 'Ubuntu-22.04-xwayland-host'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'

View File

@@ -0,0 +1,11 @@
Version: 2
Module only: True
Include: [
cmake_platforms.yaml: [
"ubuntu-22.04"
],
cmake_platforms_qemu_vxworks.yaml: [
"vxworks-imx6"
]
]
Configurations: []

View File

@@ -3,6 +3,8 @@ Module only: True
Include: [
cmake_platforms.yaml: [
"ubuntu-22.04",
"ubuntu-22.04-documentation",
"ubuntu-22.04-documentation-x11-tests",
"windows-10_22h2-msvc2019-developer-build",
"ios-universal"
],

View File

@@ -2,15 +2,15 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['DisableTests']
-
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-13-x86_64-103'
Compiler: 'Clang'
Features: ['DisableTests']
-
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Template: 'qtci-linux-RHEL-9.2-x86_64-51'
Compiler: 'GCC'
Features: ['DisableTests']
-

View File

@@ -2,33 +2,27 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10_22H2-x86_64-50'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
Environment variables: []
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
-
Template: 'qtci-windows-10-x86-4'
Template: 'qtci-windows-10_22H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
Configure arguments: ''
Environment variables: []
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
-
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Compiler: 'GCC'
Features: ['Qt5', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-macos-11-x86_64-106'
Template: 'qtci-macos-14-arm-106'
Compiler: 'Clang'
Features: ['Packaging', 'Sccache', 'DebugAndRelease']
Configure arguments: ''

View File

@@ -2,4 +2,14 @@ Version: 2
Include: [
cmake_platforms.yaml
]
Configurations: []
Configurations:
# Test on Debian-11.6 Wayland
-
Id: 'debian-11.6-arm64-wayland-tests'
Template: 'qtci-linux-Debian-11.6-aarch64-50'
Compiler: 'GCC'
Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
]
Platform dependency: 'debian-11.6-arm64'

View File

@@ -1,3 +1,13 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []
Configurations:
-
Id: 'ubuntu-22.04-axivion'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'DisableTests','Axivion_qtapplicationmanager', 'Insignificant', 'VMSize8']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]

View File

@@ -5,6 +5,7 @@ Include: [
integrity.yaml,
ios-tests.yaml,
address_sanitizer_platforms.yaml,
linux_android_tests_multi_abi.yaml
linux_android_tests_multi_abi.yaml,
wasm_qtbase_tests.yaml
]
Configurations: []

View File

@@ -3,6 +3,7 @@ Include: [
cmake_platforms.yaml,
integrity.yaml,
ios-tests.yaml,
address_sanitizer_platforms.yaml,
cmake_platforms_static_tests.yaml
]
Configurations: []

Some files were not shown because too many files have changed in this diff Show More