Compare commits

...

75 Commits

Author SHA1 Message Date
Olli Vuolteenaho
be047a1a14 QtAA: Add "documentation-warnings" config
Starting from 6.9 the "ubuntu-22.04-documentation-x11-tests" config
was replaced by "ubuntu-22.04-developer-build-x11-tests". The new
configuration doesn't test the documentation for warnings which is
why we had failures in 6.8 where to docs were checked but not in 6.9
or dev.

This commit fixes the issue by adding the relatively new
"documentation-warnings" configuration, which will once again check
our documentation.

See also 434e4a224a .

Task-number: QAA-2878
Change-Id: I479a9606ab16f8b87009d26ab03636c4c658fcb5
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit ea1abd55ce)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit f95d6b1fdb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-04-04 07:45:35 +00:00
Qt Submodule Update Bot
3f15b58b95 Update submodules on '6.9.0 in qt/qt5'
Change-Id: I415ed63f140d327bd070b0269ee78021b164a369
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-29 12:28:01 +00:00
Qt Submodule Update Bot
ef04df88c2 Update submodules on '6.9.0 in qt/qt5'
Change-Id: I9ffa181fd4549747d6df5e5ef45fcf2e43eecac0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-26 15:44:37 +00:00
Qt Submodule Update Bot
0e695e8124 Update submodules on '6.9.0 in qt/qt5'
Change-Id: I7c2a08436bad63a199b673db35a9b8e92998f81e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-26 03:15:16 +00:00
Qt Submodule Update Bot
609ddf230a Update submodules on '6.9.0 in qt/qt5'
Change-Id: I143575ead1a8b4fbf0317c987d50f894aea0dd63
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-25 09:47:58 +00:00
Qt Submodule Update Bot
eda8e5dd0d Update submodules on '6.9.0 in qt/qt5'
Change-Id: Id3c5707bf166f2e1052e46fe6f9f92b4c7a45d36
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-19 19:22:12 +00:00
Qt Submodule Update Bot
21128d2ef1 Update submodules on '6.9.0 in qt/qt5'
Change-Id: Iee3622d6169f4720f71933fd9981d0b33103460c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-18 14:32:17 +00:00
Qt Submodule Update Bot
427041f885 Update submodules on '6.9.0 in qt/qt5'
Change-Id: Iec886e87f8ac6219cbba1a192a709ff453b4e088
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-17 14:49:39 +00:00
Qt Submodule Update Bot
9f04337921 Update submodules on '6.9.0 in qt/qt5'
Change-Id: I24232ff1dacc8795421e240abc847e95df487878
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-16 01:53:37 +00:00
Qt Submodule Update Bot
4490f928ea Update submodules on '6.9.0 in qt/qt5'
Change-Id: I9c66c19a31fbcbd766e755e730a9a1d97a9b9e1d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-10 03:40:37 +00:00
Qt Submodule Update Bot
6498e80ba0 Update submodules on '6.9.0 in qt/qt5'
Change-Id: I88cdf1a3d61154f18b7d76c8a53d1fc7a4119e0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-06 02:08:17 +00:00
Timur Pocheptsov
42772064c5 install-ffmpeg-ios.sh: use a proper dylib regexp
To fix only names of FFmpeg frameworks, not system libraries/dylibs.

Fixes: QTBUG-134289
Change-Id: I74ef7700549abdccbe569ecd5d8e780fefca6e11
Reviewed-by: Simo Fält <simo.falt@qt.io>
2025-03-06 02:08:16 +00:00
Simo Fält
9babd80169 COIN: Add Debian packaging config for Debian 12
Pick-to: dev 6.9 6.8
Change-Id: Ifaf0db9b9d39c6e66003e34e6c19957b60d0289f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-03-05 12:06:59 +02:00
Jani Heikkinen
da35483fb0 Adjust submodule branches
Change-Id: I36d9acb7a7db1ce98451638a84d76793044be0df
2025-03-03 05:55:05 +00:00
Qt Submodule Update Bot
faa1c2ba7a Update submodules on '6.9 in qt/qt5'
Change-Id: I2461cc9d2863d9d77c9bfc951fbd0cd95c5a25e4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-01 10:09:14 +00:00
Tero Heikkinen
ad3f5109f8 Disable Super-key causing windows-overview effect on SLES 15 SP6
(amends 8bec383a8e)

Pick-to: 6.8
Task-number: QTBUG-132070
Task-number: QTQAINFRA-6746
Task-number: QTQAINFRA-6745
Change-Id: Iae84ba6dabbc9b9f986b8d3fcf3805549e503704
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 3cbcfb2d52)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-28 19:05:53 +00:00
Tero Heikkinen
207ba9b605 Linux: Add GCC versions visible in versions.txt
Currently only SLES and openSUSE has GCC in versions.txt.
Will also make GCC versions visible in Tools and Versions pages.

Task-number: QTQAINFRA-5901
Pick-to: 6.8 6.5
Change-Id: I9742c3151e074c503947018a0c7f7c2e0c1077bd
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 5f627786ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-28 19:05:32 +00:00
Tero Heikkinen
b8778d4e63 Synchronize GNOME based Linux gsettings into a common script
Pick-to: 6.8
Task-number: QTQAINFRA-6967
Change-Id: Ib2f17a49931dc546af82f1e0384814f9f359a3f3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 98e55af0f2)
Reviewed-by: Liang Qi <liang.qi@qt.io>
2025-02-28 21:05:05 +02:00
Marianne Yrjänä
a47c2b4ec7 Provisioning: Separate QNX710 and QNX800 qemu configs
QNX qemu configs separated. QNX710 and QNX800 require different set of
dependency libraries and there's an extra image creation bug on QNX800
that needs workaround too.
QNX800 toolchain updated.

Task-number: QTBUG-131708
Pick-to: 6.8
Change-Id: I3bc5c8bb63abbb729d03fcf3afb2f7881bcdd270
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 4791054b10)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-25 08:12:54 +00:00
Rami Potinkara
7228be7f72 Provisioning: bump Android sdkBuildToolsVersion to 35
This patch bumps the sdkBuildToolsVersion used in Coin to 35.

Task-number: QTBUG-129461
Task-number: QTBUG-130283
Change-Id: I2e1fbdfd23cb854ec50625ff29331adc61abc32c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2025-02-25 07:42:20 +02:00
Konsta Alajärvi
345aae01f5 Provisioning: bump Android sdkApiLevel to 35
This patch bumps the sdkApiLevel used in Coin to 35.

Task-number: QTBUG-129461
Task-number: QTBUG-130283
Change-Id: Ia26248982a2807b2d3554d1a7a7394efcf13f834
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2025-02-23 07:39:53 +00:00
Qt Submodule Update Bot
6e5ad2a7e8 Update submodules on '6.9 in qt/qt5'
Change-Id: Iab5b7d7e49e13195b8e726778f2e35346164ff58
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-02-21 20:17:48 +00:00
Paul Wicking
be88fababd Add .gitreview file
`git-review` is a command line tool for interacting with Gerrit.
Some IDEs offer support for this tool, either natively or through
plugins. The tool relies on a configuration file, .gitreview. Adding
this configuration file to our repositories simplifies initial setup
for contributors that use the tool directly or through their IDE of
choice.

The configuration file adds a remote called 'gerrit'. This is the
default for the tool, and also the name set for
codereview.qt-project.org by Qt's `init-repository` script. Thus,
the configuration should work seamlessly alongside other repository
helpers.

Task-number: QTBUG-132604
Pick-to: 6.8
Change-Id: Iea428aeaa1b4cdbaabd3477aaf061b8960efc887
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
(cherry picked from commit 9b8cb71d6b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-20 09:06:07 +00:00
Eike Ziller
626a22cc74 COIN/QtCreator: Move to Ubuntu 24.04 for ARM
Debian is no longer supported for Qt 6.8.1 and later

Pick-to: 6.8
Change-Id: Ic9ddac3d95451b900f60be6a90efd5fb32985601
Reviewed-by: Patrik Teivonen <patrik.teivonen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit 014bdc24ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-17 14:59:09 +00:00
Eike Ziller
db2d504099 COIN/QtCreator: Update to Windows 11 23H2
That is what we are using for packages too.

Pick-to: 6.8
Change-Id: I88ab02f577933292c882ec4633d9087b1bf957ea
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 53280b0697)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-14 15:11:16 +00:00
Toni Saario
c03c22faae Remove PinCores features
Effect of this experiment was inconclusive. In some isolated cases
limited benefit was seen, but in overall metrics no change was
observed.

Remove the feature to gain the lost computing capacity back. If the
removal causes noticeably higher flakiness etc, it can be reevaluated.

Task-number: QTQAINFRA-6702
Change-Id: I001fc2d3740a287d4546d0f597e81ded9f5449cb
(cherry picked from commit 8d51e875cb)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-02-11 16:41:39 +02:00
Jøger Hansegård
3b9008ca75 Update Windows provisioning to use 7z version 24.09
Task-number: QTQAINFRA-6833
Pick-to: 6.8 6.5 5.15
Change-Id: Iebb1a6fe879e3b550479cf109df79199536742e6
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit a1c47252fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-08 02:28:06 +00:00
Timur Pocheptsov
27be5c2f98 Update provisioning script to build FFmpeg for iOS
as xcframeworks so that we can provide both arm64 and arm64-simulator
versions (the former can be used in App Store, the latter when
working with a simulator).

Pick-to: 6.8
Task-number: QTBUG-132313
Change-Id: Ic683f58dffcef8a06adb4a915c4e3abc4ab219e5
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 1968adc126)
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-02-05 17:38:56 +01:00
Tor Arne Vestbø
77a614d592 macOS: Set PostgreSQL_ROOT during provisioning rather than in each config
Decouples provisioning from build configurations.

Pick-to: 6.8
Change-Id: I53b0983ab8b20c40568c1b5b9a24bfe3c62cf531
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7f51bdbd8d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-02 23:32:39 +00:00
Tor Arne Vestbø
55ef82de88 macOS: Set Protobuf_ROOT during provisioning rather than in each config
Decouples provisioning from build configurations.

Pick-to: 6.8
Change-Id: Ied2b60b360ef5ec5aab1dd4b2e6a0b81032d2938
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit ac2b15075c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-02 23:32:37 +00:00
Tor Arne Vestbø
1bb142175a Use correct path for libiodbc and forward via ODBC_ROOT env var
The hard-coded path paths added to LIBRARY_PATH and CPLUS_INCLUDE_PATH
was not correct on Apple Silicon Macs, where homebrew installs into
/opt/homebrew/.

There's also no point in passing on the library location via compiler
environment variables, when we can use ODBC_ROOT. And we don't need
to pass it on as a CMake define, as a environment variable works just
fine. This decouples the provisioning of libiodbc from the build
configurations.

Pick-to: 6.8
Change-Id: I40aa3c1852fb0baf3366fa1a9dab85a66eef95e2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 124957a8cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-02-02 23:32:28 +00:00
Piotr Wiercinski
27b0c6daff wasm tests: Update Chrome to 131 and use headless mode
Newer version of Chrome together with healdess mode
should provide more stability.

Change-Id: Ifb6b326b90067d9e069ebef662356d28e2c9edd7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit ae85de3cf8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-28 22:40:59 +00:00
Qt Submodule Update Bot
ffb6de83c9 Update submodules on '6.9 in qt/qt5'
Change-Id: I5c2a745c3db8d7de6efa3466c82744eb7138302a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-28 03:03:18 +00:00
Piotr Wierciński
e732ea40d7 wasm: Update Emscripten to 3.1.70
Change-Id: I2a1250d2744d12f5d3f8122f7931c821c607f71b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
(cherry picked from commit c052b991b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-23 17:52:19 +00:00
Tero Heikkinen
4eac58fb7c Add Perl JSON module
Needed with all the machines generating SBOM

Task-number: QTQAINFRA-6871
Task-number: QTBUG-131434
Change-Id: I15a79c005f530c551f9026e2cbfb465ed1211e98
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 6c6faeefd2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-22 08:14:13 +00:00
Tero Heikkinen
1b6c7cfa17 SLES 15 SP5: Update timezone package
Updates:
  - Timezone package from 2023c to 2024a
  - qtci-linux-SLES-15_SP5-x86_64-50 --> 51

Task-number: QTQAINFRA-6901
Pick-to: 6.8
Change-Id: I8ae65d0f8729e9dcf9147f45b09279fb805027ef
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 8d0f126d85)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-22 08:14:11 +00:00
Matti Paaso
3579a0c95c Provisioning: Update Axivion bauhaus suite and license file
Task-number: QTQAINFRA-6880
Pick-to: 6.8 6.5
Change-Id: I92a70dcb14bbba0ded889894059f2de849b1f557
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 45491c61fc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-20 07:12:44 +00:00
Rami Potinkara
f537715537 Android: Android 15 as maximum supported version
This patch
- Replaces Android 14 with Android 15 as a maximum version
- Introduces Android 15 system image to CI cache
- Sets Android 15 as significant

Task-number: QTQAINFRA-6478
Fixes: QTQAINFRA-6652
Pick-to: 6.8 6.5
Change-Id: Icb6de43f3e2c2f7f98f3172c83d66bebf9603d24
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 2c85a91e07)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-18 15:31:45 +00:00
Michal Klocek
096d09d1a5 Add html5lib to python.3.11
RHEL 8 installs python3-html5lib, however this only affects
installed pythnon 3.6, webengine should use
3.11 therefore add it to pip installer.

The change for switching webengine to 3.11 is in
so installing of python3-htmllib can be removed.

Fixes: QTBUG-132584
Change-Id: Ia6f4262971f60b960a61a466f418750c0d956cbc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit f8e873b188)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-01-17 09:45:22 +00:00
Alexey Edelev
5b0d2e87d0 Disable top-level configure run for the cross-builds
The 'target' configurations currently trigger the 'host'
configure command line, and are duplication of the existing
rule we have for the host machines. Disable the top-level
configure checks for the 'target' builds completely.

Fixes: QTBUG-132799
Pick-to: 6.8
Change-Id: Ia06dde53825e882e78a8c6be9e62779aaedcebf4
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 6f0c6b1614)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-16 14:17:02 +00:00
Tor Arne Vestbø
81f7f5b413 Enable crash reporting via Swift on macOS 15
Swift 5.9 includes built in crash reporting, printing stack traces,
libraries, and registers to stdout/err.

https://www.swift.org/blog/swift-5.9-backtraces/

As (Core)Foundation is written in Swift nowadays, we get this feature
for free even in our "C++" apps, as we always link to CoreFoundation.

Our test binaries have been taught how to hook into this, so the
remaining step is to enable it via the SWIFT_BACKTRACE env var.

Change-Id: I72dbd9ea934ecc3091766456509f4bd42b2bdab8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a8b2d9bcdc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-16 11:39:17 +00:00
Qt Submodule Update Bot
d0ead4f0a3 Update submodules on '6.9 in qt/qt5'
Change-Id: Iaa124ff3c7a1b742b809271ea1ef2a96db6978d5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-16 11:33:08 +00:00
Samuli Piippo
b07fbbf935 WoA: update template
WoA template got updated in 2151c5510f
and 0f18b0bc2f, but not everywhere.

Pick-to: 6.8
Change-Id: Ie2ee9e62f9bc10753bd527a2b1a7edc5de46ca60
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 69dfa0449c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-03 20:46:04 +00:00
Elias Toivola
0148e13038 Windows 11 23h2: Install Windows SDK 10.0.26100.1742
Change Windows 11 23h2 x86_64 tier-1 template -53 -> -54, where Windows SDK 10.0.26100.1742 is installed.

Task-number: QTQAINFRA-6862
Task-number: COIN-1206
Pick-to: 6.8
Change-Id: I713ea4d5032145a92d7bcbccec6c98543cbc90d2
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 4bfe8b9d71)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-01-03 13:21:59 +02:00
Elias Toivola
2c0ce8b3f2 Windows 10: Install Windows SDK 10.0.26100.1742
Change Windows 10 22h2 x86_64 tier-1 template -52 -> -53, where Windows
SDK 10.0.26100.1742 is installed.

Task-number: QTQAINFRA-6862
Task-number: COIN-1206
Pick-to: 6.8
Change-Id: Ia78f8d3b67c3aa546a4f47ad503f44782722631f
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 75578f016a)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-01-03 13:21:55 +02:00
Elias Toivola
91ba03e3b5 WoA: Install Windows SDK 10.0.26100.1742
Change Windows 22h2 arm64 tier-1 template -54 -> -55, where Windows
SDK 10.0.26100.1742 is installed.

Task-number: QTQAINFRA-6862
Task-number: COIN-1206
Pick-to: 6.8
Change-Id: Id4b008d12ee092daa1e84c50d9a36240ee680483
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 0f18b0bc2f)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2025-01-03 13:21:50 +02:00
Antti Kokko
d78024c6d5 Add missing documentation target for QtAA build
Task-number: QAA-2754
Change-Id: Icfd3bbeb94287e6e9a325af7785df173778044d9
Reviewed-by: Maija Metso <maija.metso@qt.io>
(cherry picked from commit e1f67cc3e6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-03 06:29:45 +00:00
Qt Submodule Update Bot
7b7a3ea702 Update submodules on '6.9 in qt/qt5'
Change-Id: Ia39a2917db36fee9685fca9c6ead25059407daf1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-02 22:54:41 +00:00
Johanna Äijälä
db53942a70 Provisioning: update Squish 8.1
Remove Squish provisioning from Debian11.6: Squish wont work
due GLIBC versiom mismatch.

Pick-to: 6.8
Pick-to: 6.8
Change-Id: I7bac15d585a87b402e41c9ab09099e2cabbd09d1
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit 30a5af347f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-01-02 05:23:45 +00:00
Qt Submodule Update Bot
9bfbeb48d9 Update submodules on '6.9 in qt/qt5'
Change-Id: I6ec4a671624dc0189fa0ec4b56447b5e93dda99b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-31 02:44:27 +00:00
Tero Heikkinen
5e74968c61 Provisioning: Add missing Vulkan library to Windows on ARM
Fixes: QTQAINFRA-6830
Pick-to: 6.8
Change-Id: Ia074c55ddd20414f0d6b0dbcc674cc8eb82b1cf8
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
(cherry picked from commit e179279962)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-30 09:08:11 +00:00
Elias Toivola
d777fa2926 Android: update emulator version to 35.2.10
The newest stable version of Android emulator should bring more
stability.

Pick-to: 6.8 6.5
Fixes: QTQAINFRA-6805
Change-Id: Id67d3ec888b486e6aae862588928528788583aae
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 9078baf0a9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-30 09:08:03 +00:00
Qt Submodule Update Bot
34f15ccd11 Update submodules on '6.9 in qt/qt5'
Change-Id: I9121e04c3187d48dc380164b307be4eaeda6c7f8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-27 16:41:40 +00:00
Qt Submodule Update Bot
36aa81cb1b Update submodules on '6.9 in qt/qt5'
Change-Id: Ib25a71094f2b9237f118769791c355c289929c09
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-26 14:25:17 +00:00
Qt Submodule Update Bot
0e4d9053fc Update submodules on '6.9 in qt/qt5'
Change-Id: I452cd74e35d919c3f5394b7b58952635634642ff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-25 11:04:26 +00:00
Qt Submodule Update Bot
3c2be7486c Update submodules on '6.9 in qt/qt5'
Change-Id: Ie3f875d78ded4fe66ac035a60687c9b3a61a3b4a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-24 13:45:27 +00:00
Qt Submodule Update Bot
42097ba59d Update submodules on '6.9 in qt/qt5'
Change-Id: I4e1d791a600518f12f8659736468287b89df947c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-23 20:16:23 +00:00
Alexandru Croitor
6db401beda coin: Switch ios-tests-on-macos to use qtci-macos-14-arm-106
This will use the newer iOS 17 SDK during the build, and allow us to
enforce the minimum SDK version check.

This change also switches to using an arm mac for the build.

Pick-to: 6.8
Task-number: QTBUG-119490
Change-Id: Ie9ff2b2f4fe40bda2856d4b12a03aaa05f836de4
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit f5970f9c62)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:42 +00:00
Oliver Wolff
51dec3728f README.md: Update minimal versions of Windows compilers
Pick-to: 6.8
Change-Id: Id743e89d0858fde4678b7ba4e848d780d19771fc
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 8319245b04)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:37 +00:00
Tero Heikkinen
b7abace894 Fix macOS ffmpeg ios parallel compiling to cause resource starvation
Add -j4 to limit how many cores is used to build ffmpeg-ios binaries.
Error in logs: "posix_spawn failed: Resource temporarily unavailable"

Task-number: QTQAINFRA-6803
Pick-to: 6.8
Change-Id: I3fb56cdbe4cbda8f779852b0a16121916aa5a1d4
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 6569f201c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:33 +00:00
Alexandru Croitor
32d895a2a0 CMake: Raise CI-tested minimum CMake version to 3.22.6
Also change the upper case L to lower case l, because it's changed
upstream.

Amends 0cfa1fa561

Task-number: QTBUG-131169
Change-Id: I5e501e37bb5516e15a2cbb68cb523ebc5e88d47c
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
(cherry picked from commit ffef920337)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:29 +00:00
Tero Heikkinen
5ae41db586 Provisioning: Make Windows Path visible at the end of provisioning
There's possibility that some installations might add more into
Path that doesn't get visible during the installation process.

Change makes it easier to detect if there's i.e. JRE installed during
Mimer, which caused Java SE update to 17 fail in qtbase build for
Android, because JRE was the first Java found from Path and it
wasn't the required new JDK 17 version.

This can lead even to test with incorrect version of Java, which can
happen with any other different version installations as well.

Task-number: QTQAINFRA-6392
Task-number: QTQAINFRA-6385
Pick-to: 6.8
Change-Id: Idce79eb06d73894ae648e0be53ff1f07bb21392d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 444167f5fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:25 +00:00
Elias Toivola
cfe773d749 Provisioning: Exit when an emscripten install command fails
If there is an error in emsdk scripts when running ".\emsdk install",
the provisioning would still continue. This change will make the script
exit and stop provisioning when the install command fails.

Also remove the attempt to use Python 2 and make sure the installation
finds Python 3 instead.

Pick-to: 6.8 6.5
Task-number: QTQAINFRA-5453
Change-Id: If052adcd446537b0eeb6261e4a297e9aeb292c6e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 879c8b91f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:21 +00:00
Pavel Dubsky
22b3565849 Update FFmpeg version to n7.1
Task-number: QTBUG-129510
Pick-to: 6.8 6.5
Change-Id: I15a801c0c0568b26486e5bb2065a1d0d1d151951
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 154b41a260)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-22 13:35:16 +00:00
Qt Submodule Update Bot
d23693dc5e Update submodules on '6.9 in qt/qt5'
Change-Id: Iaa6552accab0f2073893c85ab1b5e9c113be570e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-21 02:19:12 +00:00
Tero Heikkinen
5622b33626 wasm: enable exceptions for autotests build for openSUSE 15.6
Qt auto tests now require exceptions due to usage of
QTEST_THROW_ON_FAIL and QTEST_THROW_ON_SKIP.

(Amends 72e2341971)

Task-number: QTBUG-121822
Change-Id: I175ce8459660465477a0ac29d65353c871df69b9
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 565847e632)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-19 11:10:58 +00:00
Alexandru Croitor
22ae1bb5ee init-repository: Normalize git urls with more than one '../' segment
The qttools qlitehtml submodule url was recently updated to use a
relative url like '../../playground/qlitehtml.git' instead of an
absolute path to code.qt.io repo.
Same for the nested litehtml submodule.

This broke initialization of the qttools repository, because the
init-repository script only normalized one '../' segment in the
submodule url, instead of all of them, which ended up trying to clone
a non-existent git://code.qt.io/qt/../playground/qlitehtml.git repo.

Apply the url normalization in all the code paths where there might
still be '../' segments in the url.

Pick-to: 6.8
Change-Id: Iaa8e58104c92858318ad66aefa5a38d63ad7a155
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit ff25d705a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-19 11:10:51 +00:00
Toni Saario
d619cb643a Make VxWorks tests more significant
This makes ARM target tests significant for qtbase, qtgraphs and
qtgrpc. Intel target tests for qtgraphs, qtgrpc, qtlanguageserver,
qtquicktimeline, qtmultimedia, qtshadertools and qtsvg.

Change-Id: I4ae3591dacb21207d5aaf65c1fdff4fd19c3903c
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 90071f1d7c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-19 11:10:45 +00:00
Tero Heikkinen
1ff2454942 Remove openSUSE 15.5 from CI
openSUSE 15.6 is replacing openSUSE 15.5 [CI Platforms]

Task-number: QTQAINFRA-6740
Change-Id: I7b1fcced5d27533c9d42c290e6f0106bdf35dfd6
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 54c7225ed4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-19 11:10:37 +00:00
Tero Heikkinen
e583a0928b Make openSUSE 15.6 tests as blocking in CI
[CI Platforms]

Task-number: QTQAINFRA-6740
Change-Id: I844ef1e36d99a9cee2aaa5abf2050ed30b7e043f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d3ff4a42f6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-19 11:10:34 +00:00
Tero Heikkinen
ab25d7a08b Extend usage of pin cores feature for all targets running tests
Extending feature usage with newest and recently added CI platforms
  - openSUSE 15.6
  - SLES 15 SP6

The feature enables 1:1 pinning of CPU cores for VM, which should mean
more stable CPU allocation from host and fewer sporadic failure.

The down side of this is that the targets will effectively use double
the capacity from the host that they previously would. It is to be seen
how effective this is in reducing flakiness, which would counter the
increased usage by reducing staging needed.

In Coin the feature is limited so that it only affects test VMs.

(Amends cf237ca8dc)

Task-number: QTQAINFRA-6702
Change-Id: I34f76b127899a878ef2ddf8f3c09904d8e21f493
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 1c4e0928ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-19 11:10:32 +00:00
Ville-Pekka Karhu
dc1f9e060a Provisioning: Add Simulator Runtime installation to macOS
Task-number: QTQAINFRA-6774
Pick-to: 6.8
Change-Id: I2461911d20ba2fda7b2c53d38b0e688139501e22
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 1f6f97a141)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-12-18 17:49:27 +00:00
Qt Submodule Update Bot
28e2fcc202 Update submodules on '6.9 in qt/qt5'
Change-Id: I119e3f81db18b9376ab7c349d9a2f841c34542df
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-11 19:01:24 +00:00
Qt Submodule Update Bot
77e9af9920 Update submodules on '6.9 in qt/qt5'
Change-Id: I31180bf79769de24abc1fb8306e100a22da97322
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-10 04:49:39 +00:00
Jani Heikkinen
8f7aafe9d3 Adjust submodule branches
Change-Id: I6bd8b23f632c67b7e2e2da86ae42b9b93865f30e
2024-12-09 06:11:28 +00:00
183 changed files with 1146 additions and 587 deletions

86
.gitmodules vendored
View File

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

4
.gitreview Normal file
View File

@@ -0,0 +1,4 @@
[gerrit]
host=codereview.qt-project.org
project=qt/qt5
defaultbranch=dev

View File

@@ -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 11.2 or later)
* Supported compiler (Visual Studio 2022 or later, or MinGW-builds gcc 13.1 or later)
* Python 3 ([https://www.python.org/downloads/windows/] or from Microsoft Store)
```

View File

@@ -93,9 +93,15 @@ function(qt_ir_run_git_submodule_init submodules working_directory)
qt_ir_setup_commit_template("${working_directory}" "${working_directory}")
endfunction()
# Add gerrit remotes to the repository.
function(qt_ir_add_git_remotes repo_name working_directory)
set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/qt/")
# Add gerrit remotes to the repository located in the working_directory.
# repo_relative_url is the relative URL of the repository.
# Examples:
# - qt5
# - qttools.git
# - ../playground/qlitehtml.git
# - ../qt/qttools-litehtml.git
function(qt_ir_add_git_remotes repo_relative_url working_directory)
set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/")
set(gerrit_repo_url "${gerrit_ssh_base}")
qt_ir_get_option_value(codereview-username username)
@@ -110,7 +116,10 @@ function(qt_ir_add_git_remotes repo_name working_directory)
string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}")
endif()
string(APPEND gerrit_repo_url "${repo_name}")
set(namespace "qt")
set(repo_relative_url_with_namespace "${namespace}/${repo_relative_url}")
qt_ir_normalize_git_url("${repo_relative_url_with_namespace}" normalized_url)
string(APPEND gerrit_repo_url "${normalized_url}")
qt_ir_execute_process_and_log_and_handle_error(
COMMAND_ARGS git config remote.gerrit.url "${gerrit_repo_url}"
@@ -193,15 +202,21 @@ function(qt_ir_clone_one_submodule submodule_name)
set(submodule_base_git_path "${${prefix}_${submodule_name}_base_git_path}")
set(submodule_url "${submodule_base_git_path}")
qt_ir_has_url_scheme("${submodule_url}" has_url_scheme)
qt_ir_parse_git_url(
URL "${submodule_url}"
OUT_VAR_HAS_URL_SCHEME has_url_scheme
)
if(NOT has_url_scheme AND arg_BASE_URL)
set(submodule_url "${arg_BASE_URL}${submodule_url}")
qt_ir_normalize_git_url("${submodule_url}" submodule_url)
endif()
qt_ir_get_mirror(mirror_url)
set(mirror "")
if(NOT has_url_scheme AND mirror_url AND (should_clone OR arg_FETCH))
set(mirror "${mirror_url}${submodule_base_git_path}")
qt_ir_normalize_git_url("${mirror}" mirror)
endif()
set(mirror_or_original_url "${submodule_url}")

View File

@@ -40,16 +40,77 @@ function(qt_ir_get_git_config_contents out_var)
set(${out_var} "${git_output}" PARENT_SCOPE)
endfunction()
# Checks whether the given url has a scheme like https:// or is just a
# relative path.
function(qt_ir_has_url_scheme url out_var)
string(REGEX MATCH "^[a-z][a-z0-9+\-.]*://" has_url_scheme "${url}")
# Parses a git repo url to:
# - check if the given url has a scheme like https:// or git:// or is just a
# relative path with no scheme (possibly containing '../' segments)
# - extracts the scheme if it exists
# - extracts the url without the scheme
function(qt_ir_parse_git_url)
set(options "")
set(oneValueArgs
URL
OUT_VAR_HAS_URL_SCHEME
OUT_VAR_SCHEME
OUT_VAR_URL_WITHOUT_SCHEME
)
set(multiValueArgs "")
cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
string(REGEX MATCH "^([a-z][a-z0-9+\-.]*://)(.+)" url_scheme_match "${arg_URL}")
if(url_scheme_match)
set(has_url_scheme TRUE)
set(scheme "${CMAKE_MATCH_1}")
set(url_without_scheme "${CMAKE_MATCH_2}")
else()
set(has_url_scheme FALSE)
set(scheme "")
set(url_without_scheme "${url}")
endif()
if(arg_OUT_VAR_HAS_URL_SCHEME)
set(${arg_OUT_VAR_HAS_URL_SCHEME} "${has_url_scheme}" PARENT_SCOPE)
endif()
if(arg_OUT_VAR_SCHEME)
set(${arg_OUT_VAR_SCHEME} "${scheme}" PARENT_SCOPE)
endif()
if(arg_OUT_VAR_URL_WITHOUT_SCHEME)
set(${arg_OUT_VAR_URL_WITHOUT_SCHEME} "${url_without_scheme}" PARENT_SCOPE)
endif()
endfunction()
# Normalizes a url that contains '../' path segments.
# Removes the '../' segments and the directories that they precede.
# Example:
# git://code.qt.io/qt/../playground/qlitehtml.git
# will be normalized to:
# git://code.qt.io/playground/qlitehtml.git
function(qt_ir_normalize_git_url url out_var)
# The exact perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {}
# That got rid of ../ and ../../ in the path, but it broke down
# when more than two '../' segments were present.
#
# In CMake, we instead parse the url to get the non-scheme suffix,
# use get_filename_component(ABSOLUTE) to resolve the url as if it was a relative path
# and then re-add the scheme if it was present.
qt_ir_parse_git_url(
URL "${url}"
OUT_VAR_HAS_URL_SCHEME has_url_scheme
OUT_VAR_SCHEME url_scheme
OUT_VAR_URL_WITHOUT_SCHEME url_without_scheme
)
# Note the empty BASE_DIR is important, otherwise the path is relative to
# ${CMAKE_CURRENT_SOURCE_DIR}.
get_filename_component(normalized_url "${url_without_scheme}" ABSOLUTE BASE_DIR "")
if(has_url_scheme)
set(${out_var} TRUE PARENT_SCOPE)
else()
set(${out_var} FALSE PARENT_SCOPE)
string(PREPEND normalized_url "${url_scheme}")
endif()
set(${out_var} "${normalized_url}" PARENT_SCOPE)
endfunction()
# Parses a key-value line from a .git/config or .gitmodules file
@@ -79,14 +140,22 @@ endmacro()
# url_value
# the url where to clone a repo from
# in perl script it was called $base
# e.g. '../qtbase.git', 'https://code.qt.io/playground/qlitehtml.git'
# Examples:
# - '../qtbase.git'
# - 'https://code.qt.io/playground/qlitehtml.git'
# - '../../playground/qlitehtml.git'
# parent_repo_base_git_path
# the base git path of the parent of the submodule
# it is either a relative dir or a full url
# in the perl script it was called $my_repo_base,
# it was passed as first arg to git_clone_all_submodules,
# it was passed the value of $subbases{$module} when doing recursive submodule cloning
# e.g. 'qt5', 'tqtc-qt5', 'qtdeclarative.git', 'https://code.qt.io/playground/qlitehtml.git'
# Examples:
# - 'qt5'
# - 'tqtc-qt5'
# - 'qtdeclarative.git'
# - 'qttools.git'
# - 'https://code.qt.io/playground/qlitehtml.git'
#
# Outputs
#
@@ -94,21 +163,21 @@ endmacro()
# just the value of ${url_value}
# ${out_var_prefix}_${submodule_name}_base_git_path
# the whole url if it has a scheme, otherwise it's the value of
# ${url_value} relative to ${parent_repo_base_git_path}, so all the ../ are collapsed
# e.g. 'qtdeclarative.git'
# 'https://code.qt.io/playground/qlitehtml.git',
# ${url_value} relative to ${parent_repo_base_git_path}, so some of the '../' segments
# are collapsed depending on how many path segments are available in
# ${parent_repo_base_git_path}.
# Examples:
# - 'qtdeclarative.git'
# - 'https://code.qt.io/playground/qlitehtml.git'
# - '../playground/qlitehtml.git'
macro(qt_ir_parse_git_url_key out_var_prefix submodule_name url_value parent_repo_base_git_path)
qt_ir_has_url_scheme("${url_value}" has_url_scheme)
qt_ir_parse_git_url(
URL "${url_value}"
OUT_VAR_HAS_URL_SCHEME has_url_scheme
)
if(NOT has_url_scheme)
set(base_git_path "${parent_repo_base_git_path}/${url_value}")
# The exact code perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {}
# That got rid of ../ and ../../ in the path, but it broke down
# when more than two ../ were present.
# We just use ABSOLUTE to resolve the path and get rid of all ../
# Note the empty BASE_DIR is important, otherwise the path is relative to
# ${CMAKE_CURRENT_SOURCE_DIR}.
get_filename_component(base_git_path "${base_git_path}" ABSOLUTE BASE_DIR "")
qt_ir_normalize_git_url("${base_git_path}" base_git_path)
else()
set(base_git_path "${url_value}")
endif()

View File

@@ -47,3 +47,20 @@ instructions:
condition: property
property: features
contains_value: UseConfigure
disable_if:
condition: or
conditions:
- condition: property
property: target.osVersion
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
- condition: and
conditions:
- condition: property
property: target.os
equals_value: Windows
- condition: property
property: target.arch
not_equals_property: host.arch
- condition: property
property: features
not_contains_value: "DebianPackaging"

View File

@@ -1,20 +1,10 @@
Version: 2
Configurations:
-
Id: 'opensuse-15.5-host-asan'
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Compiler: 'GCC'
Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
]
-
Id: 'opensuse-15.6-host-asan'
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer', 'InsignificantTests']
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',

View File

@@ -30,13 +30,13 @@ Configurations:
Id: 'ubuntu-22.04-developer-build-x11-tests'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['PinCores', 'Sccache', 'TestOnly']
Features: ['Sccache', 'TestOnly']
Platform dependency: 'ubuntu-22.04-developer-build'
-
Id: 'ubuntu-22.04-x11-tests'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['PinCores', 'Sccache', 'TestOnly']
Features: ['Sccache', 'TestOnly']
Platform dependency: 'ubuntu-22.04'
# Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
-
@@ -65,7 +65,7 @@ Configurations:
Id: 'ubuntu-24.04-arm64-offscreen-tests'
Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
Compiler: 'GCC'
Features: ['PinCores', 'TestOnly']
Features: ['TestOnly']
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'QT_QPA_OFFSCREEN_NO_GLX=1',
@@ -99,30 +99,19 @@ Configurations:
Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
Compiler: 'GCC'
Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests']
Features: ['Sccache', 'TestOnly', 'InsignificantTests']
Platform dependency: 'ubuntu-24.04-x64-developer-build'
-
Id: 'ubuntu-24.04-x64-x11-tests'
Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
Compiler: 'GCC'
Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests']
Features: ['Sccache', 'TestOnly', 'InsignificantTests']
Platform dependency: 'ubuntu-24.04-x64'
-
Id: 'opensuse-15.5-developer-build'
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Compiler: 'GCC'
Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
]
-
Id: 'opensuse-15.6-developer-build'
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'InsignificantTests']
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
@@ -131,7 +120,7 @@ Configurations:
]
-
Id: 'sles-15_sp5-static'
Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
@@ -151,9 +140,9 @@ Configurations:
]
-
Id: 'windows-10_22h2-msvc2022'
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'MSVC2022'
Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
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}}',
@@ -163,9 +152,9 @@ Configurations:
]
-
Id: 'windows-11_23H2-msvc2022'
Template: 'qtci-windows-11_23H2-x86_64-53'
Template: 'qtci-windows-11_23H2-x86_64-54'
Compiler: 'MSVC2022'
Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
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}}\..',
@@ -175,9 +164,9 @@ Configurations:
]
-
Id: 'windows-11_22h2-arm64-msvc2022'
Template: 'qtci-windows-11_22H2-aarch64-54'
Template: 'qtci-windows-11_22H2-aarch64-55'
Compiler: 'MSVC2022'
Features: ['PinCores', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
@@ -186,7 +175,7 @@ Configurations:
]
-
Id: 'windows-11_23H2-msvc2022-arm64'
Template: 'qtci-windows-11_23H2-x86_64-53'
Template: 'qtci-windows-11_23H2-x86_64-54'
Compiler: 'MSVC2022'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
@@ -202,9 +191,9 @@ Configurations:
]
-
Id: 'windows-11_23H2-msvc2022-developer-build'
Template: 'qtci-windows-11_23H2-x86_64-53'
Template: 'qtci-windows-11_23H2-x86_64-54'
Compiler: 'MSVC2022'
Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
Configure arguments: '-debug-and-release -force-asserts -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}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
@@ -216,7 +205,7 @@ Configurations:
Id: 'rhel-8.10'
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
Compiler: 'GCC'
Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
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}}',
@@ -226,7 +215,7 @@ Configurations:
Id: 'rhel-9.4'
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
Compiler: 'GCC'
Features: ['PinCores', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
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',
@@ -247,9 +236,9 @@ Configurations:
]
-
Id: 'windows-10_22h2-mingw13'
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'Mingw'
Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
Environment variables: [
'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -260,9 +249,9 @@ Configurations:
]
-
Id: 'windows-11_23H2-llvm'
Template: 'qtci-windows-11_23H2-x86_64-53'
Template: 'qtci-windows-11_23H2-x86_64-54'
Compiler: 'Clang'
Features: ['PinCores', 'Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
Environment variables: [
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
@@ -273,9 +262,9 @@ Configurations:
]
-
Id: 'windows-11_23H2-mingw13-developer-build'
Template: 'qtci-windows-11_23H2-x86_64-53'
Template: 'qtci-windows-11_23H2-x86_64-54'
Compiler: 'Mingw'
Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
Environment variables: [
'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -310,7 +299,19 @@ Configurations:
'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
]
-
Id: 'bookworm-gles-arm64-debian-pkg-packaging'
Template: 'qtci-linux-Debian-11.6-aarch64-50'
Compiler: 'GCC'
Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
Environment variables: [
'DEBIAN_RULES_REF=6.9_gles',
'COIN_TARGET_DIST=tqtc-bookworm',
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
]
-
# This configuration runs for every submodule, using externally
# built qdoc and qattributionscanner binaries, to ensure that no
@@ -320,6 +321,6 @@ Configurations:
Id: 'documentation-warnings'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['PinCores', 'Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2']
Features: ['Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2']
Platform dependency: 'ubuntu-22.04'

View File

@@ -7,7 +7,7 @@ Configurations:
Target arch: 'armv7'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Features: ['PinCores', 'Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples']
Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-asserts -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',
@@ -24,7 +24,7 @@ Configurations:
Target arch: 'arm64'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Features: ['PinCores', 'Sccache', 'UseConfigure', 'InsignificantTests']
Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-asserts -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',

View File

@@ -8,13 +8,14 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-22.04'
Features: ['PinCores', 'Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
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.30.5/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= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'QNX_QEMU={{.Env.QNX_710_QEMU}}',
]
-
Id: 'qnx-710-arm64-on-linux'

View File

@@ -8,7 +8,7 @@ Configurations:
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'vxworks-imx6-buildtest'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
Environment variables: [
'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB',
'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_2_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_2_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_2_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
@@ -23,7 +23,7 @@ Configurations:
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'vxworks-x86_64-buildtest'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
Environment variables: [
'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB',
'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',

View File

@@ -3,7 +3,7 @@ Configurations:
-
Id: 'windows-11_23H2-msvc2022-minimal-static-test'
Template: 'qtci-windows-11_23H2-x86_64-53'
Template: 'qtci-windows-11_23H2-x86_64-54'
Compiler: 'MSVC2022'
Features: ['Sccache', 'UseConfigure', 'Packaging', 'MinimalStaticTests']
Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql'
@@ -15,7 +15,7 @@ Configurations:
]
-
Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test'
Template: 'qtci-windows-11_22H2-aarch64-53'
Template: 'qtci-windows-11_22H2-aarch64-55'
Compiler: 'MSVC2022'
Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
@@ -53,9 +53,8 @@ Configurations:
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-static -nomake examples -release -no-framework -no-icu -qt-doubleconversion -no-feature-sql-psql'
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}}',
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
]
-

View File

@@ -2,9 +2,9 @@ Version: 2
Configurations:
-
Id: 'sles-15_sp5-minimal-static'
Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
Compiler: 'GCC'
Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure']
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
@@ -20,9 +20,9 @@ Configurations:
]
-
Id: 'windows-11_23H2-minimal-static'
Template: 'qtci-windows-11_23H2-x86_64-53'
Template: 'qtci-windows-11_23H2-x86_64-54'
Compiler: 'MSVC2022'
Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure']
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
@@ -34,5 +34,5 @@ Configurations:
Id: 'macos-minimal-static'
Template: 'qtci-macos-14-arm-106'
Compiler: 'Clang'
Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure']
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'

View File

@@ -17,7 +17,7 @@ Configurations:
]
-
Id: 'android-armv7-on-windows'
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-10_22H2-x86_64-53'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Mingw'
@@ -39,7 +39,7 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.10'
Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
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',
@@ -47,22 +47,6 @@ Configurations:
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
'ANDROID_EMULATOR=emulator_x86_api_28'
]
-
Id: 'android-14-x86_64-on-linux'
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.10'
Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
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}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
'ANDROID_EMULATOR=emulator_x86_64_api_34'
]
-
Id: 'android-15-x86_64-on-linux'
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
@@ -71,7 +55,7 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.10'
Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
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',

View File

@@ -2,36 +2,25 @@ Version: 2
Configurations:
-
Id: 'webassembly-linux-thread-asyncify'
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Target os: 'WebAssembly'
Compiler: 'GCC'
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 \
-feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
]
-
Id: 'webassembly-linux-thread-asyncify-openSUSE-15.6'
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'opensuse-15.6-developer-build'
Features: ['Sccache', 'DoNotRunTests', 'UseConfigure']
Features: ['DoNotRunTests', 'UseConfigure']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
"TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
-DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
-feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"",
'HEADLESS_CHROME_FOR_TESTING=true'
]
-
Id: 'webassembly-windows'
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-10_22H2-x86_64-53'
Target os: 'WebAssembly'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'windows-10_22h2-mingw13'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Environment variables: [
'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -41,24 +30,11 @@ Configurations:
]
-
Id: 'webassembly-linux-thread'
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'opensuse-15.5-developer-build'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
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 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
]
-
Id: 'webassembly-linux-thread-openSUSE-15.6'
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'opensuse-15.6-developer-build'
Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
@@ -67,24 +43,11 @@ Configurations:
]
-
Id: 'webassembly-linux-shared'
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'opensuse-15.5-developer-build'
Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
]
-
Id: 'webassembly-linux-shared-openSUSE-15.6'
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'opensuse-15.6-developer-build'
Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared',

View File

@@ -2,13 +2,13 @@ Version: 2
Configurations:
-
Id: "ios-tests-on-macos"
Template: 'qtci-macos-13-x86_64-103'
Template: 'qtci-macos-14-arm-106'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-universal-on-x86_64'
Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
]

View File

@@ -10,10 +10,9 @@ Configurations:
Platform dependency: [
'rhel-8.10',
'android-9-x86-on-linux',
'android-14-x86_64-on-linux'
'android-15-x86_64-on-linux'
]
Features: [
'PinCores',
'Sccache',
'WarningsAreErrors',
'AndroidTestRun',
@@ -23,7 +22,7 @@ Configurations:
Environment variables: [
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10',
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux',
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux',
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux',
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
'ANDROID_EMULATOR=emulator_x86_api_28'
]

View File

@@ -15,9 +15,8 @@ Configurations:
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
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}}',
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
]
-
@@ -29,7 +28,6 @@ Configurations:
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
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}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
]
@@ -119,7 +117,6 @@ Configurations:
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
]
-
Id: 'macos-14-arm64-developer-build'
@@ -129,7 +126,6 @@ Configurations:
Configure arguments: '-developer-build -nomake examples -debug -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}} -DQT_DEPLOY_FFMPEG=TRUE',
]

View File

@@ -7,7 +7,7 @@ Include: [
Configurations:
-
Id: 'qnx-710-arm64-on-windows'
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-10_22H2-x86_64-53'
Target os: 'QNX_710'
Target arch: 'arm64'
Compiler: 'MSVC2019'

View File

@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: 'windows-11_23H2-msvc2022-unity-build'
Template: 'qtci-windows-11_23H2-x86_64-53'
Template: 'qtci-windows-11_23H2-x86_64-54'
Compiler: 'MSVC2022'
Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
@@ -53,6 +53,5 @@ Configurations:
Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -framework'
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}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_UNITY_BUILD=ON',
]

View File

@@ -2,7 +2,7 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'MSVC2019'
Features: ['DisableTests']
-

View File

@@ -2,7 +2,7 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-11_23H2-x86_64-53'
Compiler: 'MSVC2022'
Features: ['Sccache', 'DebugAndRelease']
Configure arguments: ''
@@ -15,7 +15,7 @@ Configurations:
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-linux-Debian-11.6-aarch64-50'
Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
Compiler: 'GCC'
Features: ['Sccache', 'DebugAndRelease']
Configure arguments: ''
@@ -28,7 +28,7 @@ Configurations:
Environment variables: []
# without tests
-
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-11_23H2-x86_64-53'
Compiler: 'MSVC2022'
Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
Configure arguments: ''
@@ -36,7 +36,7 @@ Configurations:
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
# oldest Qt version
-
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-11_23H2-x86_64-53'
Compiler: 'MSVC2022'
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
Configure arguments: ''

View File

@@ -15,9 +15,6 @@ Include: [
Configurations: []
Overrides:
# Make VxWorks tests insignificant.
-
Id: 'vxworks-imx6-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
-
Id: 'vxworks-x86_64-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

View File

@@ -10,7 +10,7 @@ Overrides:
# Make VxWorks tests insignificant.
-
Id: 'vxworks-imx6-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
-
Id: 'vxworks-x86_64-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

View File

@@ -14,7 +14,7 @@ Overrides:
# Make VxWorks tests insignificant.
-
Id: 'vxworks-imx6-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
-
Id: 'vxworks-x86_64-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

View File

@@ -6,8 +6,3 @@ Include: [
address_sanitizer_platforms.yaml
]
Configurations: []
Overrides:
# Make VxWorks arm tests insignificant.
-
Id: 'vxworks-imx6-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

View File

@@ -6,8 +6,3 @@ Include: [
address_sanitizer_platforms.yaml
]
Configurations: []
Overrides:
# Make VxWorks arm tests insignificant.
-
Id: 'vxworks-imx6-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

View File

@@ -11,4 +11,4 @@ Overrides:
# Make VxWorks x86_64 tests insignificant.
-
Id: 'vxworks-x86_64-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

View File

@@ -11,4 +11,4 @@ Overrides:
# Make VxWorks x86_64 tests insignificant.
-
Id: 'vxworks-x86_64-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

View File

@@ -8,7 +8,6 @@ Include: [
cmake_platforms.yaml: [
"ubuntu-22.04",
"ubuntu-22.04-developer-build",
"opensuse-15.5-developer-build",
"opensuse-15.6-developer-build",
"sles-15_sp5-static",
"sles-15_sp6-static",

View File

@@ -8,7 +8,6 @@ Include: [
cmake_platforms.yaml: [
"ubuntu-22.04",
"ubuntu-22.04-developer-build",
"opensuse-15.5-developer-build",
"opensuse-15.6-developer-build",
"sles-15_sp5-static",
"sles-15_sp6-static",
@@ -49,7 +48,7 @@ Configurations:
]
-
Id: 'Windows-MSVC2022_Static'
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'MSVC2022'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql'

View File

@@ -10,7 +10,7 @@ Overrides:
# Make VxWorks tests insignificant.
-
Id: 'vxworks-imx6-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
-
Id: 'vxworks-x86_64-tests'
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

View File

@@ -1,7 +1,7 @@
Version: 2
Configurations:
-
Template: 'qtci-windows-10_22H2-x86_64-52'
Template: 'qtci-windows-10_22H2-x86_64-53'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
Features: ['Packaging', UseLegacyInstructions']

View File

@@ -1,6 +1,7 @@
Version: 2
Include: [
cmake_platforms.yaml: [
"documentation-warnings",
"rhel-8.10",
'windows-10_22h2-mingw13',
'ubuntu-22.04-developer-build',
@@ -13,8 +14,9 @@ Include: [
'android-arm64-on-macos',
'android-armv7-on-windows',
'android-9-x86-on-linux',
'android-14-x86_64-on-linux'
]
'android-15-x86_64-on-linux'
],
offline_documentation.yaml
]
Configurations:
-

View File

@@ -2,15 +2,8 @@ Version: 2
Configurations:
-
Id: 'webassembly-linux-thread-asyncify-tests'
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Target os: 'WebAssembly'
Compiler: 'GCC'
Features: ['PinCores', 'Sccache', 'TestOnly']
Platform dependency: 'webassembly-linux-thread-asyncify'
-
Id: 'webassembly-linux-thread-asyncify-tests-openSUSE-15.6'
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
Target os: 'WebAssembly'
Compiler: 'GCC'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'webassembly-linux-thread-asyncify-openSUSE-15.6'
Platform dependency: 'webassembly-linux-thread-asyncify'

View File

@@ -56,6 +56,10 @@ Windows 10 SDK (10.0.22000.0)
Windows 10 SDK (10.0.22621.0)
Windows Universal C Runtime
Windows SDK (10.0.26100.1742) was later downloaded and installed from:
https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
# COIN-1206
# NOTE! Work loads were added during installation!
############################################################

View File

@@ -56,6 +56,10 @@ Windows 11 SDK (10.0.22000.0)
Windows 11 SDK (10.0.22621.0)
Windows Universal C Runtime
Windows SDK (10.0.26100.1742) was later downloaded and installed from:
https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
# COIN-1206
# NOTE! Work loads were added during installation!
############################################################

View File

@@ -57,6 +57,10 @@ Windows 11 SDK (10.0.22000.0)
Windows 11 SDK (10.0.22621.0)
Windows Universal C Runtime
Windows SDK (10.0.26100.1742) was later downloaded and installed from:
https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
# COIN-1206
# NOTE! Work loads were added during installation!
############################################################

View File

@@ -26,18 +26,13 @@ toolsVersion="2.1"
toolsFile="commandlinetools-linux-6609375_latest.zip"
ndkVersionLatest="r26b"
ndkVersionDefault=$ndkVersionLatest
sdkBuildToolsVersion="34.0.0"
sdkApiLevel="android-34"
sdkBuildToolsVersion="35.0.1"
sdkApiLevel="android-35"
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4"
ndkSha1Default=$ndkSha1Latest
# Android 14 avd zip
android14SystemZipName="android14system_UE1A_230829_036.tar.gz"
android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5"
android14SystemPath="$basePath/$android14SystemZipName"
# Android Automotive max SDK level image
sdkApiLevelAutomotiveMax="android-34"
androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
@@ -136,12 +131,12 @@ cd "$sdkTargetFolder/cmdline-tools/tools/bin"
./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
| eval "$sdkmanager_no_progress_bar_cmd"
echo "Download and unzip Android Emulator version 34.1.19"
emulatorFileName="emulator-linux_x64-11525734.zip"
echo "Download and unzip Android Emulator version 35.2.10"
emulatorFileName="emulator-linux_x64-12414864.zip"
emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
emulatorSha1="d6cc94109b081c5f6042dcb71a453144f7e62ce7"
emulatorSha1="41dd213d120f727d8c3840347d234b135793ba10"
DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"
@@ -162,13 +157,20 @@ echo "Unzipping the Android 9 to $minVersionDestination"
sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
rm "$minVersionFilePath"
echo "y" | ./sdkmanager --install "system-images;android-35;google_apis;x86_64" \
| eval "$sdkmanager_no_progress_bar_cmd"
echo "Download and unzip Android 15 System Image"
maxVersionFileName="x86_64-35_r08.zip"
maxVersionDestination="$sdkTargetFolder/system-images/android-35/google_apis/"
maxVersionFilePath="$maxVersionDestination/$maxVersionFileName"
maxVersionCiUrl="$basePath/system-images/google_apis/$maxVersionFileName"
maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName"
maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b"
echo "Extract stored Android 14 Beta $android14SystemZipName"
DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \
"/tmp/$android14SystemZipName"
sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images"
mkdir -p "$maxVersionDestination"
DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"
echo "Unzipping the Android 15 to $maxVersionDestination"
sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
rm "$maxVersionFilePath"
echo "Checking the contents of Android SDK again..."
ls -l "$sdkTargetFolder"
@@ -176,9 +178,6 @@ ls -l "$sdkTargetFolder"
echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \
-k "system-images;android-28;google_apis;x86"
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \
-k "system-images;android-34;google_apis;x86_64"
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \
-k "system-images;android-35;google_apis;x86_64"

View File

@@ -9,13 +9,13 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
majorminorversion="3.16"
version="3.16.8"
PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz"
SHA1="a4d2f96f475ccc8e1ae1d97cf6c8ce39abaa9d7c"
majorminorversion="3.22"
version="3.22.6"
PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
SHA1="4a5ba17568d108d295719850dd584e775583f61b"
targetFolder="/opt/cmake-$version"
appPrefix="cmake-$version-Linux-x86_64"
appPrefix="cmake-$version-linux-x86_64"
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"

View File

@@ -0,0 +1,17 @@
#!/usr/bin/env bash
# Copyright (C) 2024 The Qt Company Ltd
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# This script modifies GNOME based Linux configurations
set -ex
# Desktop
echo "Disable blank screen power saving (timeout 0 = never)"
gsettings set org.gnome.desktop.session idle-delay 0
echo "Disable Automatic screen lock when screensaver goes active"
gsettings set org.gnome.desktop.screensaver lock-enabled false
echo "Disable window animations."
gsettings set org.gnome.desktop.interface enable-animations false
echo "Disable hot corner feature"
gsettings set org.gnome.desktop.interface enable-hot-corners false

View File

@@ -26,12 +26,12 @@ DownloadAndExtract () {
aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/"
QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/710/"
targetFolder="/opt/"
folderName="qnx710"
targetPath="$targetFolder$folderName"
qemuTargetPath="$HOME/QNX"
qemuTargetPath="$HOME/QNX710"
qemuIpAddress="172.31.1.10"
export qemuNetwork="172.31.1.1"
qemuSSHuser="root"
@@ -81,7 +81,7 @@ fi
# Set env variables
SetEnvVar "QNX_710" "$targetPath"
SetEnvVar "QNX_QEMU" "$qemuTargetPath"
SetEnvVar "QNX_710_QEMU" "$qemuTargetPath"
SetEnvVar "QNX_QEMU_IPADDR" "$qemuIpAddress"
SetEnvVar "QNX_QEMU_SSH" "$qemuSSHurl"
SetEnvVar "QNX_QEMU_LD_LIBRARY_PATH" "$qemuLDpath"

View File

@@ -26,12 +26,12 @@ DownloadAndExtract () {
aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/"
QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/800/"
targetFolder="/opt/"
folderName="qnx800"
targetPath="$targetFolder$folderName"
qemuTargetPath="$HOME/QNX"
qemuTargetPath="$HOME/QNX800"
qemuIpAddress="172.31.1.10"
export qemuNetwork="172.31.1.1"
qemuSSHuser="root"
@@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then
fi
# QNX SDP
sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-linux-20240510.tar.xz"
sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20240930.tar.xz"
targetFile="qnx800.tar.xz"
sha1="93245a5bc11b88563328f0763573942fd25b5e18"
sha1="a86d6e001e4ad46f50ed430fb85e8230e730751b"
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
sudo cp "$aarch64le_toolchain" "$targetPath"
@@ -81,5 +81,11 @@ fi
# Set env variables
SetEnvVar "QNX_800" "$targetPath"
SetEnvVar "QNX_800_QEMU" "$qemuTargetPath"
# These are common defines with QNX710
SetEnvVar "QNX_QEMU_IPADDR" "$qemuIpAddress"
SetEnvVar "QNX_QEMU_SSH" "$qemuSSHurl"
SetEnvVar "QNX_QEMU_LD_LIBRARY_PATH" "$qemuLDpath"
echo "QNX SDP = 8.0.0" >> ~/versions.txt

View File

@@ -0,0 +1,19 @@
# Need to add all testserver names statically
# as current Docker uses Multicast DNS (mDNS) (avahi)
# Which does not work with QNX qemu
172.31.1.1 apache2 apache2.test-net.qt.local
172.31.1.1 squid squid.test-net.qt.local
172.31.1.1 vsftpd vsftpd.test-net.qt.local
172.31.1.1 ftp-proxy ftp-proxy.test-net.qt.local
172.31.1.1 danted danted.test-net.qt.local
172.31.1.1 cyrus cyrus.test-net.qt.local
172.31.1.1 echo echo.test-net.qt.local
172.31.1.1 iptables iptables.test-net.qt.local
# For network test server which is still used on some test
# like networkselftest for local dns resolution
172.31.1.1 qt-test-server
# QtCoap testservers
172.31.1.1 californium californium.test-net.qt.local
172.31.1.1 freecoap freecoap.test-net.qt.local

View File

@@ -0,0 +1,2 @@
search test-net.qt.local
nameserver 172.31.1.1

View File

@@ -0,0 +1,46 @@
#!/bin/bash
function brief()
{
echo "--nfs=[<mount>|no]"
}
function help()
{
brief
cat <<EOF
If yes, the given nfs share "<mount>" will be mounted at <mount>
The default is no.
EOF
}
function validate() {
exit 0
}
function configure()
{
if [ "$OPT_NFS_QT" != no ]; then
cat >output/option_files/post_start.opt_nfs <<EOF
echo "---> Starting NFS"
STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 -t 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT
EOF
fi
exit 0
}
case "$1" in
brief)
brief;;
help)
help;;
validate)
validate;;
configure)
configure;;
default)
echo no;;
esac

View File

@@ -0,0 +1,88 @@
OPT_ABLELOCK='no'
DEF_OPT_ABLELOCK='no'
OPT_ARCH='x86_64'
DEF_OPT_ARCH='x86_64'
OPT_ASLR='yes'
DEF_OPT_ASLR='yes'
OPT_CERTICOM='no'
DEF_OPT_CERTICOM='no'
OPT_CRYPTODEV='no'
DEF_OPT_CRYPTODEV='no'
OPT_DATA_INODES='3000'
DEF_OPT_DATA_INODES='3000'
OPT_DATA_SIZE='512'
DEF_OPT_DATA_SIZE='60'
OPT_EXTRA_DIRS='none'
DEF_OPT_EXTRA_DIRS='none'
OPT_GRAPHICS='no'
DEF_OPT_GRAPHICS='no'
OPT_GUEST='none'
DEF_OPT_GUEST='none'
OPT_HOSTNAME='qnx_QEMU_CI'
DEF_OPT_HOSTNAME='noname'
OPT_IP='172.31.1.69'
DEF_OPT_IP='dhcp'
OPT_MACADDR='52:54:00:f1:c4:92'
DEF_OPT_MACADDR='generate'
OPT_NFS='no'
DEF_OPT_NFS='no'
OPT_NFS_QT='/home/qt/work'
DEF_OPT_NFS_QT='/home/qt/work'
OPT_PATHTRUST='no'
DEF_OPT_PATHTRUST='no'
OPT_PERL='no'
DEF_OPT_PERL='no'
OPT_POLICY='none'
DEF_OPT_POLICY='none'
OPT_PYTHON='no'
DEF_OPT_PYTHON='no'
OPT_QAUDIT='no'
DEF_OPT_QAUDIT='no'
OPT_QFIM='no'
DEF_OPT_QFIM='no'
OPT_QTD='no'
DEF_OPT_QTD='no'
OPT_QVM='no'
DEF_OPT_QVM='no'
OPT_REPOS='$QNX_STAGE_nto:$QNX_TARGET'
DEF_OPT_REPOS='$QNX_STAGE_nto:$QNX_TARGET'
OPT_ROOT='no'
DEF_OPT_ROOT='no'
OPT_SAFE='no'
DEF_OPT_SAFE='no'
OPT_SECPOL='no'
DEF_OPT_SECPOL='no'
OPT_SECURE_DATA='no'
DEF_OPT_SECURE_DATA='no'
OPT_SECURE_PROCFS='yes'
DEF_OPT_SECURE_PROCFS='yes'
OPT_SLM='no'
DEF_OPT_SLM='no'
OPT_SSHD_PREGEN='yes'
DEF_OPT_SSHD_PREGEN='yes'
OPT_SSH_IDENT='prompt'
DEF_OPT_SSH_IDENT='prompt'
OPT_SYS_INODES='1000'
DEF_OPT_SYS_INODES='1000'
OPT_SYS_SIZE='20'
DEF_OPT_SYS_SIZE='20'
OPT_TCG='no'
DEF_OPT_TCG='no'
OPT_TELNET='no'
DEF_OPT_TELNET='no'
OPT_TOMCRYPT='no'
DEF_OPT_TOMCRYPT='no'
OPT_TOYBOX='no'
DEF_OPT_TOYBOX='no'
OPT_TYPE='qemu'
DEF_OPT_TYPE='qemu'
OPT_TZ='UTC0'
DEF_OPT_TZ='UTC0'
OPT_UNION='yes'
DEF_OPT_UNION='yes'
OPT_USB='no'
DEF_OPT_USB='no'
OPT_VALGRIND='no'
DEF_OPT_VALGRIND='no'
OPT_ZONEINFO='no'
DEF_OPT_ZONEINFO='no'

View File

@@ -0,0 +1,25 @@
# local/snippets/data_files.custom
# Placeholder for local list of files to add to data partition
home/root/.ssh/environment = {
TERM=qansi
PATH=__IFS_PATH__:/system/xbin:.
#LD_LIBRARY_PATH=__PROC_LIB__:/home/qt/work/install/target/lib
#QSG_RHI_BACKEND=software
#QT_QPA_PLATFORM=offscreen
}
[uid=0 gid=0 dperms=755 type=dir] var/share
var/share/zoneinfo=usr/share/zoneinfo
[uid=0 gid=0 dperms=755 type=dir] var/share/fonts
var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
var/share/fonts=usr/share/fonts
var/etc/hosts=local/misc_files/etc/hosts
var/etc/resolv.conf=local/misc_files/etc/resolv.conf
var/etc/nsswitch.conf=etc/nsswitch.conf
[uid=0 gid=0 dperms=755 type=dir] var/etc/ssl/certs
var/share/ca-certificates=local/misc_files/ca-certificates
var/etc/ssl/certs=local/misc_files/etc/ssl/certs

View File

@@ -0,0 +1,12 @@
# Add root HOME env variable
procmgr_symlink /data/home/root/ /home/root
HOME=/home/root
# Needed for timezone related tests
TZ=Europe/Oslo
procmgr_symlink /data/var/share /usr/share
procmgr_symlink /data/var/share/zoneinfo/Europe/Oslo /data/var/etc/localtime
# fontconfig
#procmgr_symlink /data/var/etc/fontconfig/fonts.conf /etc/fontconfig/fonts.conf
#procmgr_symlink /data/var/share/fonts /usr/share/fonts

View File

@@ -0,0 +1,3 @@
root:x:0:0:Superuser:/data/home/root:/bin/sh
sshd:x:15:6:sshd:/data/var/chroot/sshd:/bin/false
qnxuser:x:__QNXUSER_UID__:__QNXUSER_GID__:User9:/data/home/qnxuser:/bin/sh

View File

@@ -0,0 +1,29 @@
# local/snippets/post_start.custom
# Commands executed from post_startup.sh. Executed at the end of system startup whether slm is in use
# or not
#
# To allow resource managers to be run properly with and without security policies, command lines
# should be written in one of the following forms:
#
# START(resmgr_t) resmgr DROPROOT(resmgr_uid)
# STARTU(resmgr_t, resmgr_uid) resmgr
# Where resmgr_t is the security type name (arbitrary but usually the name of the resmgr with _t appended),
# and resmgr_uid is the id to use for both uid and gid. DROPROOT is used only in cases where the
# resource manager supports a -U option for switching to non-root.
echo "---> Starting Filesystem event manager (fsevmgr)"
STARTU_P(fsevmg_t,__FSEVMG_ID__) fsevmgr -d -F __DEVB_ID__ -N __DEVB_ID__
echo "---> Remove large fonts"
rm -rf /data/var/share/fonts/NotoSansCJK*
rm -rf /data/var/share/fonts/NotoSansMonoCJK*
echo "---> Create fontconfig cache"
fc-cache &
echo "---> Restart ssh daemon"
slay sshd
/system/xbin/sshd -f /system/data/etc/ssh/sshd_config
# Add default route so QNX knows where to send
# requests for unknown network
echo "---> Add default route"
route add default 172.31.1.1

View File

@@ -0,0 +1,2 @@
root::1475759054:0:0
qnxuser:@S@f0J4xZibUbKllVqPMzetauCHLRi+9C8wTsxYXE5r7Pfhda5FI7zkObEmKogy01pAX5f/1niG2S2eLXbLs3xoww==@YjBmOTQwNzZiNzYwMzY3N2RkMGQ1NTZmNzA5MDFhMWY=:1476890273:0:0

View File

@@ -0,0 +1,65 @@
# local/snippets/system_files.custom
# Placeholder for local list of files to add to system partition
[perms=444] data/etc/ssh/sshd_config={
HostKey /data/var/ssh/ssh_host_rsa_key
HostKey /data/var/ssh/ssh_host_ed25519_key
AuthorizedKeysFile .ssh/authorized_keys
PermitUserEnvironment yes
AuthenticationMethods none
PermitEmptyPasswords yes
PermitRootLogin yes
PidFile none
Subsystem sftp /system/xbin/sftp-server
}
# libraries Qt requires
lib/libicuuc.so.67=usr/lib/libicuuc.so.67
lib/libicudata.so.67=usr/lib/libicudata.so.67
lib/libicui18n.so.67=usr/lib/libicui18n.so.67
lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1
lib/libEGL.so.1=usr/lib/libEGL.so.1
lib/libz.so.2=usr/lib/libz.so.2
lib/libzstd.so.1=usr/lib/libzstd.so.1
lib/libxml2.so.2=usr/lib/libxml2.so.2
lib/libfreetype.so.24=usr/lib/libfreetype.so.24
lib/libbz2.so.1=usr/lib/libbz2.so.1
lib/liblzma.so.5=usr/lib/liblzma.so.5
lib/libdbus-1.so=usr/lib//libdbus-1.so
lib/libdbus-1.so.22=usr/lib//libdbus-1.so.22
lib/libbacktrace.so.1=lib/libbacktrace.so.1
lib/libm.so.3=lib/libm.so.3
#############################################
### Image support
#############################################
etc/system/config/img.conf=etc/system/config/img.conf
lib/libpng16.so.16=usr/lib/libpng16.so.16
lib/libjpeg.so.9=lib/libjpeg.so.9
lib/libimg.so.1=lib/libimg.so.1
lib/dll/img_codec_bmp.so=lib/dll/img_codec_bmp.so
lib/dll/img_codec_gif.so=lib/dll/img_codec_gif.so
lib/dll/img_codec_jpg.so=lib/dll/img_codec_jpg.so
lib/dll/img_codec_png.so=lib/dll/img_codec_png.so
lib/dll/img_codec_sgi.so=lib/dll/img_codec_sgi.so
lib/dll/img_codec_tga.so=lib/dll/img_codec_tga.so
lib/dll/img_codec_tif.so=lib/dll/img_codec_tif.so
# for inotify
xbin/fsevmgr=sbin/fsevmgr
##############################################
### Sreen support
##############################################
lib/libscreen.so.1=usr/lib/libscreen.so.1
# for fontconfig
lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
xbin/fc-cache=bin/fc-cache
xbin/fc-match=local/misc_files/fc-match
# network
lib/libssl.so=usr/lib/libssl.so
xbin/nslookup=usr/bin/nslookup
xbin/unbound=sbin/unbound
xbin/curl=usr/bin/curl

View File

@@ -0,0 +1 @@
#define __FSEVMG_ID__ 50

View File

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersionLatest="r26b"
ndkVersionDefault="$ndkVersionLatest"
sdkBuildToolsVersion="34.0.0"
sdkBuildToolsVersion="35.0.1"
# this is compile sdk version
sdkApiLevel="android-34"
sdkApiLevel="android-35"
toolsSourceFile="$basePath/$toolsFile"

View File

@@ -0,0 +1,25 @@
#!/usr/bin/env bash
# Copyright (C) 2024 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
set -ex
function InstallSimulatorRuntime {
url=$1
url_alt=$2
expectedSha1=$3
packageName=$4
version=$5
DownloadURL "$url" "$url_alt" "$expectedSha1" "/tmp/$packageName"
echo "Installing"
# macOS 14 / Xcode 15 has a different install command
if [[ $OSTYPE == "darwin23" ]]; then
xcrun simctl runtime add "/tmp/$packageName"
else
xcodebuild -importPlatform "/tmp/$packageName"
fi
echo "Simulator Runtime = $version" >> ~/versions.txt
}

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright (C) 2018 The Qt Company Ltd.
# Copyright (C) 2025 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# Install libiodbc
@@ -11,12 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@"
# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc
read -r -a arr <<< "$(brew list --versions libiodbc)"
version=${arr[1]}
SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"
SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}"
SetEnvVar "ODBC_ROOT" "$(brew --prefix libiodbc)"
echo "libiodbc = $version" >> ~/versions.txt

View File

@@ -37,5 +37,5 @@ umount "$mountpoint"
echo "Removing $packageName"
rm "/tmp/$packageName"
SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/$psqlVersion/bin"
SetEnvVar "PostgreSQL_ROOT" "/Applications/Postgres.app/Contents/Versions/$psqlVersion"
echo "PostgreSQL = $psqlVersion ($psqlAppVersion)" >> ~/versions.txt

View File

@@ -8,21 +8,21 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
version="3.1.56"
version="3.1.70"
versionNode="v16.20.0"
tarBallVersion="${version//./_}"
if uname -a |grep -q Darwin; then
if uname -a | grep -q Darwin; then
tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
sha="24c49db971da4fd7c68f6b71984c3d7775fdfb84"
sha="eafd7b96ab12d84183d2eaa62e8d39bb12c252bf"
else
tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
sha="410c93bb2ab3b244190c2cb5f0ff1ce5d6ac4eb5"
sha="047a3da9048edc71fb56af544c4bb2448d6c0644"
fi
cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/${tarBallPackage}"
target="/tmp/${tarBallPackage}"
mkdir -p /opt
cd /opt
cd /opt || exit
echo "URL: $cacheUrl"
if DownloadURL "$cacheUrl" "" "$sha" "$target"; then
@@ -31,13 +31,16 @@ if DownloadURL "$cacheUrl" "" "$sha" "$target"; then
else
echo "Emsdk isn't cached. Cloning it"
sudo git clone https://github.com/emscripten-core/emsdk.git
cd emsdk
sudo ./emsdk install "$version"
cd emsdk || exit
if ! sudo ./emsdk install "$version"; then
echo "Error: emsdk installation failed"
exit 1
fi
sudo ./emsdk activate "$version"
fi
# platform-specific toolchain and node binaries. urls obtained from "emsdk install"
if uname -a |grep -q Darwin; then
if uname -a | grep -q Darwin; then
pathNodeExecutable="node-$versionNode-darwin-x64/bin/node"
else
pathNodeExecutable="node-$versionNode-linux-x64/bin/node"

View File

@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="n7.0.2"
version="n7.1"
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
sha1="f008a93710a7577e3f85a90f4b632cc615164712"
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
ffmpeg_name="FFmpeg-$version"

View File

@@ -10,15 +10,16 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="n7.0.2"
version="n7.1"
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
sha1="f008a93710a7577e3f85a90f4b632cc615164712"
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
ffmpeg_name="FFmpeg-$version"
target_dir="$HOME"
ffmpeg_source_dir="$target_dir/$ffmpeg_name"
prefix="/usr/local/ios/ffmpeg"
dylib_regex="^@rpath/.*\.dylib$"
if [ ! -d "$ffmpeg_source_dir" ];
then
@@ -28,48 +29,49 @@ fi
ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
build_ffmpeg_ios() {
local target_arch=$1
local target_platform=$1
if [ "$target_platform" == "arm64-simulator" ]; then
target_sdk="iphonesimulator"
target_platform="arm64"
minos="-mios-simulator-version-min=16.0"
else
target_sdk="iphoneos"
target_platform="arm64"
minos="-miphoneos-version-min=16.0"
# TODO: consider non-arm simulator?
fi
if [ "$target_arch" == "x86_64" ]; then
target_sdk="iphonesimulator"
target_arch="x86_64"
minos="-mios-simulator-version-min=13.0"
else
target_sdk="iphoneos"
target_arch="arm64"
minos="-miphoneos-version-min=13.0"
fi
# Note: unlike similar install-ffmpeg scripts, not $target_platform,
# but $1 (which can be arm64-simulator with arm64 target_platform).
local build_dir="$ffmpeg_source_dir/build_ios/$1"
sudo mkdir -p "$build_dir"
pushd "$build_dir"
local build_dir="$ffmpeg_source_dir/build_ios/$target_arch"
sudo mkdir -p "$build_dir"
pushd "$build_dir"
# shellcheck disable=SC2086
sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
# shellcheck disable=SC2086
sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
--sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \
--enable-cross-compile \
--enable-optimizations \
--prefix=$prefix \
--arch=$target_arch \
--cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \
--cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \
--ar="$(xcrun --sdk ${target_sdk} --find ar)" \
--ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
--strip="$(xcrun --sdk ${target_sdk} --find strip)" \
--nm="$(xcrun --sdk ${target_sdk} --find nm)" \
--target-os=darwin \
--extra-cflags="$minos" \
--extra-cxxflags="$minos" \
--enable-cross-compile \
--enable-shared \
--disable-static \
--install-name-dir='@rpath/Frameworks' \
--enable-swscale \
--enable-pthreads \
--disable-audiotoolbox
--enable-cross-compile \
--enable-optimizations \
--prefix=$prefix \
--arch=$target_platform \
--cc="xcrun --sdk ${target_sdk} clang -arch $target_platform" \
--cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_platform" \
--ar="$(xcrun --sdk ${target_sdk} --find ar)" \
--ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
--strip="$(xcrun --sdk ${target_sdk} --find strip)" \
--nm="$(xcrun --sdk ${target_sdk} --find nm)" \
--target-os=darwin \
--extra-ldflags="$minos" \
--enable-cross-compile \
--enable-shared \
--disable-static \
--install-name-dir='@rpath' \
--enable-swscale \
--enable-pthreads \
--disable-audiotoolbox
sudo make install DESTDIR="$build_dir/installed" -j
popd
sudo make install DESTDIR="$build_dir/installed" -j4
popd
}
install_ffmpeg() {
@@ -98,11 +100,106 @@ install_ffmpeg() {
popd >/dev/null
done
sudo cp -r $1$prefix/include $prefix
echo "LS done."
}
build_ffmpeg_ios "x86_64"
build_info_plist() {
local file_path="$1"
local framework_name="$2"
local framework_id="$3"
local minimum_version_key="MinimumOSVersion"
local minimum_os_version="16.0"
local supported_platforms="iPhoneOS"
info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
<plist version=\"1.0\">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${framework_name}</string>
<key>CFBundleIdentifier</key>
<string>${framework_id}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${framework_name}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>7.0.2</string>
<key>CFBundleVersion</key>
<string>7.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>${minimum_version_key}</key>
<string>${minimum_os_version}</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>${supported_platforms}</string>
</array>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>"
echo $info_plist | sudo tee ${file_path} 1>/dev/null
}
create_framework() {
# Create a 'traditional' framework from the corresponding dylib.
local framework_name="$1"
local platform="$2" # For now it's either arm64 or arm64-simulator, see below.
local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/installed/usr/local/ios/ffmpeg"
local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework"
sudo cp "${ffmpeg_library_path}/lib/${framework_name}.dylib" "${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
# Fix LC_ID_DYLIB (to be libavcodec.framework/libavcodec instead of @rpath/libavcodec.xx.yy.dylib
sudo install_name_tool -id @rpath/${framework_name}.framework/${framework_name} "${framework_complete_path}"
build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name}
# Fix all FFmpeg-related LC_LOAD_DYLIB, similar to how we fixed LC_ID_DYLIB above:
otool -L "$framework_complete_path" | awk '/\t/ {print $1}' | egrep "$dylib_regex" | while read -r dependency_path; do
found_name=$(tmp=${dependency_path/*\/}; echo ${tmp/\.*})
if [ "$found_name" != "$framework_name" ]
then
sudo install_name_tool -change "$dependency_path" @rpath/${found_name}.framework/${found_name} "${framework_complete_path}"
fi
done
#sudo mkdir -p "$prefix/framework/"
#sudo cp -r "${ffmpeg_library_path}/framework/${framework_name}.framework" "$prefix/framework/"
}
create_xcframework() {
# Create 'traditional' framework from the corresponding dylib,
# also creating
local framework_name="$1"
local fw1="$ffmpeg_source_dir/build_ios/arm64/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework"
local fw2="$ffmpeg_source_dir/build_ios/arm64-simulator/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework"
sudo mkdir -p "$prefix/framework/"
sudo xcodebuild -create-xcframework -framework $fw1 -framework $fw2 -output "${prefix}/framework/${framework_name}.xcframework"
}
build_ffmpeg_ios "arm64-simulator"
build_ffmpeg_ios "arm64"
install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed"
ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale"
for name in $ffmpeg_libs; do
create_framework $name "arm64"
create_framework $name "arm64-simulator"
done
# Create corresponding (xc)frameworks containing both arm64 and arm64-simulator frameworks:
for name in $ffmpeg_libs; do
create_xcframework $name
done
install_ffmpeg "$ffmpeg_source_dir/build_ios/arm64/installed"
SetEnvVar "FFMPEG_DIR_IOS" $prefix

View File

@@ -17,9 +17,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="n7.0.2"
version="n7.1"
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
sha1="f008a93710a7577e3f85a90f4b632cc615164712"
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
ffmpeg_name="FFmpeg-$version"

View File

@@ -92,6 +92,8 @@ cmake "$targetDir" -G"Ninja Multi-Config" \
ninja all:all
sudo env "PATH=$PATH" ninja install:all
SetEnvVar "Protobuf_ROOT" "$installPrefix/lib/cmake/protobuf"
# Refresh shared library cache if OS isn't macOS
if uname -a |grep -qv "Darwin"; then
sudo ldconfig

View File

@@ -11,8 +11,8 @@ set -ex
# This script will fetch and extract pre-buildt squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
version="8.0.0"
qtBranch="67x"
version="8.1.0"
qtBranch="68x"
installFolder="/opt"
squishFolder="$installFolder/squish"
preBuildCacheUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/jenkins_build/stable"
@@ -24,14 +24,14 @@ testSuiteUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/coin/suite_test_squi
testSuiteLocal="/tmp/squish_test_suite"
if uname -a |grep -q Darwin; then
compressedFolder="prebuild-squish-$version-$qtBranch-mac-x64.tar.gz"
sha1="8ae422b44af9b8e5f0d15cdca08df99973b8699a"
sha1="03a0c713d0d328667df2e7804f2e4d507707b849"
else
if [ "$PROVISIONING_ARCH" = arm64 ] ; then
compressedFolder="prebuild-squish-$version-$qtBranch-linux-arm64.tar.gz"
sha1="06d542579271f88b1527d6ddca2bfd4eaf2dade5"
sha1="f6a2eb69faed64f13b164fb8d056182c41d2952c"
else
compressedFolder="prebuild-squish-$version-$qtBranch-linux-x64.tar.gz"
sha1="db5c48f359b46a460551cdf9362c63f557cbc04f"
sha1="b798417ddf4b668306cb90d551df906828644152"
fi
fi

View File

@@ -24,8 +24,8 @@ $ndkZip = "C:\Windows\Temp\android_ndk.zip"
$toolsVersion = "2.1"
$toolsFile = "commandlinetools-win-6609375_latest.zip"
$sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-34"
$sdkBuildToolsVersion = "34.0.0"
$sdkApiLevel = "android-35"
$sdkBuildToolsVersion = "35.0.1"
$toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"

View File

@@ -5,14 +5,15 @@
# This script will install emscripten needed by WebAssembly
$version = "3.1.56"
$version = "3.1.70"
$zipVersion = $version -replace '\.', "_"
$temp = "$env:tmp"
$cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"
$sha = "ab376d218f1a66302c36770977948f74f0576a42"
$sha = "4d05e378575cb3d74e2740b121730ba1f5822f27"
# Make sure python is in the path
Prepend-Path "C:\Python27"
# Python used for '.\emsdk install'
$pythonPath = [System.Environment]::GetEnvironmentVariable("PYTHON3_PATH", "Machine")
Prepend-Path $pythonPath
cd "C:\\Utils"
$installLocationEmsdk = "C:\\Utils\\emsdk"
@@ -24,11 +25,18 @@ try {
cd $installLocationEmsdk
.\emsdk activate $version
} catch {
Write-Host "Can't find cached emsdk. Cloning it"
Write-Host "Can't find cached emsdk or another error occurred. Cloning it"
Write-Host "Error details: $_"
C:\PROGRA~1\Git\bin\git clone https://github.com/emscripten-core/emsdk.git
cd $installLocationEmsdk
.\emsdk install $version
.\emsdk activate $version
try {
.\emsdk install $version
.\emsdk activate $version
} catch {
throw "emsdk installation failed: $_"
}
}
$versionWinPython = $($Env:EMSDK_PYTHON -split ('python\\') -split ('_64bit'))[1]

View File

@@ -6,9 +6,9 @@
# This script will install FFmpeg
$msys = "C:\Utils\msys64\usr\bin\bash"
$version="n7.0.2"
$version="n7.1"
$url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
$sha1="f008a93710a7577e3f85a90f4b632cc615164712"
$url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
$ffmpeg_name="FFmpeg-$version"

View File

@@ -5,24 +5,24 @@
# This script installs 7-Zip
$version = "23.01"
$nonDottedVersion = "2301"
$version = "24.09"
$nonDottedVersion = "2409"
$cpu_arch = Get-CpuArchitecture
switch ($cpu_arch) {
arm64 {
$arch = "-arm64"
$sha1 = "be65c2ea6119c04945c66b13413892f2bb03d9a7"
$sha1 = "2f5aaa22a4a591b01a1b06c17565233f0cd70429"
Break
}
x64 {
$arch = "-x64"
$sha1 = "7DF28D340D7084647921CC25A8C2068BB192BDBB"
$sha1 = "28b53835fe92c3fa6e0c422fc3b17c6bc1cb27e0"
Break
}
x86 {
$arch = ""
$sha1 = "D5D00E6EA8B8E68CE7A704FD478DC950E543C25C"
$sha1 = "2135a90a9f6c3202c32a87b1c5cf805ce294a497"
Break
}
default {

View File

@@ -6,8 +6,8 @@
# This script will pre-installed squish package for Windows.
# Squish is need by Release Test Automation (RTA)
$version = "8.0.0"
$qtBranch = "67x"
$version = "8.1.0"
$qtBranch = "68x"
$targetDir = "C:\Utils\squish"
$squishPackage = "C:\Utils\rta_squish"
$squishUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\jenkins_build\stable"
@@ -33,7 +33,7 @@ if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro
# In Windows 11 case $OSVersion is 'Windows 10 Pro'
$winVersion = "win10"
if (Is64BitWinHost) {
$sha1 = "0f863c261f854ec38032815298f5636e99779bff"
$sha1 = "e7497b925b9a0aa17628344dbdacd6b3acd41c3b"
}
} else {
$winVersion = "n/a"

View File

@@ -4,3 +4,6 @@ Write-Host '*****************************************************'
Write-Host '******************** Get-PSDrive ********************'
Get-PSDrive
Write-Host '*****************************************************'
Write-Host '******************** Path Content *******************'
$env:Path -split ';'
Write-Host '*****************************************************'

View File

@@ -6,13 +6,36 @@
# This script will install Vulkan SDK
# Original Download page: https://vulkan.lunarg.com/sdk/home#windows
$version = "1.2.182.0"
$cpu_arch = Get-CpuArchitecture
Write-Host "Installing $cpu_arch Vulkan SDK"
$version = "1.2.182.0" # TODO: Update to newest 1.3.296.0
switch ($cpu_arch) {
arm64 {
$version = "1.3.296.0"
$externalUrl = "https://sdk.lunarg.com/sdk/download/$version/warm/InstallVulkanARM64-$version.exe"
$internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\InstallVulkanARM64-$version.exe"
$sha1 = "7d47d8dd10c09d363e6103925c4a032abf7b2c02"
$installArgs = "--accept-licenses --default-answer --confirm-command install"
Break
}
x64 {
$externalUrl = "https://sdk.lunarg.com/sdk/download/$version/windows/VulkanSDK-$version-Installer.exe"
$internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe"
$sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e"
$installArgs = "/S"
Break
}
default {
throw "Unknown architecture $cpu_arch"
}
}
$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
$sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e"
Download "https://sdk.lunarg.com/sdk/download/1.2.182.0/windows/VulkanSDK-$version-Installer.exe" "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe" $vulkanPackage
Download "$externalUrl" "$internalUrl" "$vulkanPackage"
Verify-Checksum "$vulkanPackage" "$sha1"
Run-Executable $vulkanPackage "/S"
Run-Executable "$vulkanPackage" "$installArgs"
Write-Host "Cleaning $vulkanPackage.."
Remove "$vulkanPackage"

View File

@@ -6,6 +6,7 @@
set -ex
BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
@@ -13,12 +14,9 @@ NTS_IP=10.212.2.216
echo "Set timezone to UTC."
sudo timedatectl set-timezone Etc/UTC
echo "Timeout for blanking the screen (0 = never)"
gsettings set org.gnome.desktop.session idle-delay 0
echo "Prevents screen lock when screesaver goes active."
gsettings set org.gnome.desktop.screensaver lock-enabled false
echo "Disable window animations."
gsettings set org.gnome.desktop.interface enable-animations false
"$BASEDIR/../common/linux/configure-gnome-shell.sh"
echo "Set grub timeout to 0"
sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
sudo update-grub

View File

@@ -1,6 +0,0 @@
#!/usr/bin/env bash
#Copyright (C) 2023 The Qt Company Ltd
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/squishInstall.sh"

View File

@@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0")
# shellcheck source=../common/shared/network_test_server_ip.txt
source "$BASEDIR/../common/shared/network_test_server_ip.txt"
echo "Disable window animations."
gsettings set org.gnome.desktop.interface enable-animations false
echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
echo "Set DISPLAY"
@@ -20,10 +18,8 @@ export DISPLAY=:0
# Set timezone to UTC.
sudo timedatectl set-timezone Etc/UTC
# disable Automatic screen lock
gsettings set org.gnome.desktop.screensaver lock-enabled false
# disable blank screen power saving
gsettings set org.gnome.desktop.session idle-delay 0
"$BASEDIR/../common/linux/configure-gnome-shell.sh"
# Set Wayland enable as false.
echo "Setting Wayland enable as false"

View File

@@ -86,7 +86,6 @@ installPackages+=(libXtst-devel)
installPackages+=(libxshmfence-devel)
installPackages+=(nspr-devel)
installPackages+=(nss-devel)
installPackages+=(python3-html5lib)
installPackages+=(libatomic)
installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64)
# For Android builds
@@ -154,6 +153,8 @@ installPackages+=(zip)
installPackages+=(perl-IPC-Cmd)
# password management support for Qt Creator
installPackages+=(libsecret-devel)
# For tst_license.pl with all the machines generating SBOM
installPackages+=(perl-JSON)
sudo yum -y install "${installPackages[@]}"
@@ -167,7 +168,7 @@ sudo pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/py
sudo pip config --user set global.extra-index-url https://pypi.org/simple/
sudo pip3 install virtualenv wheel
sudo python3.11 -m pip install virtualenv wheel
sudo python3.11 -m pip install virtualenv wheel html5lib
sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
# For now we don't set QT_SBOM_PYTHON_APPS_PATH here, and rely on the build system to find the
# system python3.11.
@@ -175,6 +176,9 @@ sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requi
sudo /usr/bin/pip3 install wheel
sudo /usr/bin/pip3 install dataclasses
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
echo "GCC = $gccVersion" >> versions.txt
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

View File

@@ -8,8 +8,6 @@ BASEDIR=$(dirname "$0")
# shellcheck source=../common/shared/network_test_server_ip.txt
source "$BASEDIR/../common/shared/network_test_server_ip.txt"
echo "Disable window animations."
gsettings set org.gnome.desktop.interface enable-animations false
echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
echo "Set DISPLAY"
@@ -19,10 +17,8 @@ export DISPLAY=:0
# Set timezone to UTC.
sudo timedatectl set-timezone Etc/UTC
# disable Automatic screen lock
gsettings set org.gnome.desktop.screensaver lock-enabled false
# disable blank screen power saving
gsettings set org.gnome.desktop.session idle-delay 0
"$BASEDIR/../common/linux/configure-gnome-shell.sh"
# Set Wayland enable as false.
echo "Setting Wayland enable as false"

View File

@@ -140,5 +140,8 @@ sudo pip3 install virtualenv wheel
sudo /usr/bin/pip3 install wheel
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
echo "GCC = $gccVersion" >> versions.txt
OpenSSLVersion="$(openssl version |cut -b 9-14)"
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

View File

@@ -8,8 +8,6 @@ BASEDIR=$(dirname "$0")
# shellcheck source=../common/shared/network_test_server_ip.txt
source "$BASEDIR/../common/shared/network_test_server_ip.txt"
echo "Disable window animations."
gsettings set org.gnome.desktop.interface enable-animations false
echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
echo "Set DISPLAY"
@@ -19,10 +17,8 @@ export DISPLAY=:0
# Set timezone to UTC.
sudo timedatectl set-timezone Etc/UTC
# disable Automatic screen lock
gsettings set org.gnome.desktop.screensaver lock-enabled false
# disable blank screen power saving
gsettings set org.gnome.desktop.session idle-delay 0
"$BASEDIR/../common/linux/configure-gnome-shell.sh"
# Set Wayland enable as false.
echo "Setting Wayland enable as false"

View File

@@ -152,5 +152,8 @@ sudo python3.8 -m pip install virtualenv wheel
sudo /usr/bin/pip3 install wheel
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
echo "GCC = $gccVersion" >> versions.txt
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

View File

@@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0")
# shellcheck source=../common/shared/network_test_server_ip.txt
source "$BASEDIR/../common/shared/network_test_server_ip.txt"
echo "Disable window animations."
gsettings set org.gnome.desktop.interface enable-animations false
echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
echo "Set DISPLAY"
@@ -20,10 +18,8 @@ export DISPLAY=:0
# Set timezone to UTC.
sudo timedatectl set-timezone Etc/UTC
# disable Automatic screen lock
gsettings set org.gnome.desktop.screensaver lock-enabled false
# disable blank screen power saving
gsettings set org.gnome.desktop.session idle-delay 0
"$BASEDIR/../common/linux/configure-gnome-shell.sh"
# Set Wayland enable as false.
echo "Setting Wayland enable as false"

View File

@@ -162,5 +162,8 @@ sudo python3.8 -m pip install virtualenv wheel
sudo /usr/bin/pip3 install wheel
sudo /usr/bin/pip3 install dataclasses
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
echo "GCC = $gccVersion" >> versions.txt
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

View File

@@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0")
# shellcheck source=../common/shared/network_test_server_ip.txt
source "$BASEDIR/../common/shared/network_test_server_ip.txt"
echo "Disable window animations."
gsettings set org.gnome.desktop.interface enable-animations false
echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
echo "Set DISPLAY"
@@ -20,10 +18,8 @@ export DISPLAY=:0
# Set timezone to UTC.
sudo timedatectl set-timezone Etc/UTC
# disable Automatic screen lock
gsettings set org.gnome.desktop.screensaver lock-enabled false
# disable blank screen power saving
gsettings set org.gnome.desktop.session idle-delay 0
"$BASEDIR/../common/linux/configure-gnome-shell.sh"
# Set Wayland enable as false.
echo "Setting Wayland enable as false"

View File

@@ -177,6 +177,9 @@ sudo /usr/bin/pip3 install wheel
sudo /usr/bin/pip3 install dataclasses
# No sbom_requirements.txt, because it requires Python 3.9 for poetry_core -> spdx_tools and we have 3.8
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
echo "GCC = $gccVersion" >> versions.txt
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

View File

@@ -17,16 +17,11 @@ export DISPLAY=:0
# Set timezone to UTC.
sudo timedatectl set-timezone Etc/UTC
# disable Automatic screen lock
gsettings set org.gnome.desktop.screensaver lock-enabled false
# disable blank screen power saving
gsettings set org.gnome.desktop.session idle-delay 0
# Disable hot corner feature
gsettings set org.gnome.desktop.interface enable-hot-corners false
# Disable windows key from showing the GNOME Shell Activities overlay
"$BASEDIR/../common/linux/configure-gnome-shell.sh"
echo "Disable windows key from showing the GNOME Shell Activities overlay"
gsettings set org.gnome.mutter overlay-key ""
echo "Disable window animations."
gsettings set org.gnome.desktop.interface enable-animations false
# Set Wayland enable as false.
echo "Setting Wayland enable as false"

View File

@@ -166,5 +166,8 @@ sudo /usr/bin/pip3 install wheel
# Make FindPython3.cmake to find python3
sudo ln -s /usr/bin/python3 /usr/local/bin/python3
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
echo "GCC = $gccVersion" >> versions.txt
OpenSSLVersion="$(openssl version |cut -b 9-14)"
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

View File

@@ -17,16 +17,11 @@ export DISPLAY=:0
# Set timezone to UTC.
sudo timedatectl set-timezone Etc/UTC
# disable Automatic screen lock
gsettings set org.gnome.desktop.screensaver lock-enabled false
# disable blank screen power saving
gsettings set org.gnome.desktop.session idle-delay 0
# Disable hot corner feature
gsettings set org.gnome.desktop.interface enable-hot-corners false
# Disable windows key from showing the GNOME Shell Activities overlay
"$BASEDIR/../common/linux/configure-gnome-shell.sh"
echo "Disable windows key from showing the GNOME Shell Activities overlay"
gsettings set org.gnome.mutter overlay-key ""
echo "Disable window animations."
gsettings set org.gnome.desktop.interface enable-animations false
# Set Wayland enable as false.
echo "Setting Wayland enable as false"

View File

@@ -198,6 +198,9 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin"
# Make FindPython3.cmake to find python3
sudo ln -s /usr/bin/python3 /usr/local/bin/python3
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
echo "GCC = $gccVersion" >> versions.txt
OpenSSLVersion="$(openssl version |cut -b 9-14)"
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

View File

@@ -17,16 +17,11 @@ export DISPLAY=:0
# Set timezone to UTC.
sudo timedatectl set-timezone Etc/UTC
# disable Automatic screen lock
gsettings set org.gnome.desktop.screensaver lock-enabled false
# disable blank screen power saving
gsettings set org.gnome.desktop.session idle-delay 0
# Disable hot corner feature
gsettings set org.gnome.desktop.interface enable-hot-corners false
# Disable windows key from showing the GNOME Shell Activities overlay
"$BASEDIR/../common/linux/configure-gnome-shell.sh"
echo "Disable windows key from showing the GNOME Shell Activities overlay"
gsettings set org.gnome.mutter overlay-key ""
echo "Disable window animations."
gsettings set org.gnome.desktop.interface enable-animations false
# Set Wayland enable as false.
echo "Setting Wayland enable as false"

View File

@@ -167,6 +167,8 @@ installPackages+=(perl-IPC-Cmd)
installPackages+=(libsecret-devel)
# For Firebird in RTA
installPackages+=(libtommath-devel)
# For tst_license.pl with all the machines generating SBOM
installPackages+=(perl-JSON)
sudo yum -y install "${installPackages[@]}"
@@ -198,6 +200,9 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin"
# Make FindPython3.cmake to find python3
sudo ln -s /usr/bin/python3 /usr/local/bin/python3
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
echo "GCC = $gccVersion" >> versions.txt
OpenSSLVersion="$(openssl version |cut -b 9-14)"
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

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