Compare commits

..

283 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
0dff19cc15 Update submodules on '6.4.2 in qt/qt5'
Change-Id: I10abdc1c14d015eb0802135be5b016cb7cad3ce3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-13 04:56:06 +00:00
Qt Submodule Update Bot
79a9be28b7 Update submodules on '6.4.2 in qt/qt5'
Change-Id: I7941af0a990770e4fa151e36e374913b2c09255b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-09 15:23:44 +00:00
Qt Submodule Update Bot
c7d83acf94 Update submodules on '6.4.2 in qt/qt5'
Change-Id: Ie441626f1bf7d900b9d96bf4c6d14f1eb4c23851
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-08 14:05:49 +00:00
Qt Submodule Update Bot
a3f25d7dd9 Update submodules on '6.4.2 in qt/qt5'
Change-Id: I02b943e59ec15481d42ba1a4f56425fa08c245ad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-06 05:10:53 +00:00
Qt Submodule Update Bot
ff4a764177 Update submodules on '6.4.2 in qt/qt5'
Change-Id: I40b0d071fb8a29030bd64c55d4f8d97a662993b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-05 18:04:51 +00:00
Jani Heikkinen
5fe0a59caa Adjust submodule branches
Change-Id: I0141e8e47bd1c2f0a80467366d07a30b74d2592a
2022-12-02 07:42:33 +02:00
Qt Submodule Update Bot
8a5aec9b47 Update submodules on '6.4 in qt/qt5'
Change-Id: If417eebf2e4c43ef564308f3f30a9a7f2753d869
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-30 16:18:57 +00:00
Alexandru Croitor
6391aed52a CMake: Update provisioned CMake to version 3.24.2
Needed to fix iOS Xcode generator builds when using Xcode 14.
Otherwise compiler identification fails due to a code-signing error.
We hit it in our iOS MinimalStaticTests configuration.

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

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

Amends eee152ca70

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Added the execute permission to the ubuntu scripts.

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

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

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

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

Change-Id: I2bbfe1a23622deb90e7641b322ad9eac3ae4a112
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 64a715e8be)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-21 10:50:00 +00:00
Teemu Holappa
52e3f29867 Update build configuration to Ubuntu 20.04 in qtsaferenderer.yaml
Ubuntu 18.04 is not supported in 6.4 branch. In this commit.
the machine template is changed from 18.04 to 20.04.

Change-Id: I286176dd2b2fd3cbc13821882e411c227eb8d360
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2022-10-21 10:42:47 +03:00
Qt Submodule Update Bot
f2068ba5d6 Update submodules on '6.4 in qt/qt5'
Change-Id: Ia5f76c86000658a5b389b3e5389866f21fcd8c36
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-21 02:13:04 +00:00
Samuli Piippo
be94e8efff Add platform configs for Qt Insight Tracker
Change-Id: I5818b94e0c3cc706ca87935b7292714c1313a641
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit d3857df3b2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-20 05:37:42 +00:00
Qt Submodule Update Bot
8ba49dc7b5 Update submodules on '6.4 in qt/qt5'
Change-Id: Ib9e7ec347375dd142f866ed9e86bde0660659614
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-19 12:41:33 +00:00
Qt Submodule Update Bot
6b8bda0f01 Update submodules on '6.4 in qt/qt5'
Change-Id: Iccf5a1be4a245c6efaeb5b9fdeb21701ad0c2f6e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-18 22:18:12 +00:00
Qt Submodule Update Bot
cfe88ecea6 Update submodules on '6.4 in qt/qt5'
Change-Id: Ic47ea2c06c74df2dce40303c05f37d7f7a45f5b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-17 15:27:07 +00:00
Tatiana Borisova
1190025855 Update GHS compiler version to v2022.1.4
- the latest patch_20196 (UTF-16 fix) is applied

Change-Id: I0324c635b594f2a79604a36f962cca82e8a5de97
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 52d2df3a61)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-15 10:29:22 +00:00
Qt Submodule Update Bot
d533c5593b Update submodules on '6.4 in qt/qt5'
Change-Id: Icff651f7bcc1820b3a867dd100b361d5505933be
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-15 02:12:37 +00:00
Edward Welbourne
0240b3a5de Remove stray first line from provisioning script
Having a blank line before the shbang makes the shbang not work.

Change-Id: I523c4eab8746da2b898eacf3f54f73d63dbd2786
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 74fc1bcaec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-14 15:22:00 +00:00
Johanna Äijälä
c1fc588ae7 Provisioning: update Squish 7.0.1
Update Squish to 7.0.1, include versions with Qt6.3 and 6.2 support.

Change-Id: I2bd7cd51a41befdbf2ef242eb72c2c2add84f733
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 6754cb362a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-14 15:16:41 +03:00
Johanna Äijälä
7776bb2577 Update macOS11 (105) and macOS12 (105) templates
Use templates which have Accessibility enabled for
Squish.

Task-number: QTQAINFRA-3559
Change-Id: I9538ea48791ea81738a41b1e101552cfc3bd454b
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 3e380e35b0)
2022-10-14 15:16:40 +03:00
Heikki Halmet
49d893fd9e Use updated macOS 12 tier1 image with Android
Use templates which have Accessibility enabled for Squish.

Task-number: QTQAINFRA-3559
Change-Id: If3c1a68a475149efdeb3bfd19efd6edaea411167
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit d45c78212a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-14 12:16:39 +00:00
Qt Submodule Update Bot
36360821b3 Update submodules on '6.4 in qt/qt5'
Change-Id: I7f8d6649b6c7b21c11c2232b35a3d2bb2a9b5e6d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-13 19:21:18 +00:00
Qt Submodule Update Bot
635010527c Update submodules on '6.4 in qt/qt5'
Change-Id: I8cd8206872f39c32e16493cd868bdc22146a305f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-11 23:23:48 +00:00
Qt Submodule Update Bot
e29db34952 Update submodules on '6.4 in qt/qt5'
Change-Id: Ibdff4f1df0a980ee8accde8fca93bdf6d986bcce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-06 19:38:10 +00:00
Qt Submodule Update Bot
76c5f99be2 Update submodules on '6.4 in qt/qt5'
Change-Id: I554589d98fb896658c61bc24d87984244fa174be
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-04 03:19:48 +00:00
Qt Submodule Update Bot
835cf41264 Update submodules on '6.4 in qt/qt5'
Change-Id: I93b26a7acf8a8de4f4d10f5a8fe206393429b63f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-30 17:58:52 +00:00
Qt Submodule Update Bot
ebcdf06e03 Update submodules on '6.4 in qt/qt5'
Change-Id: I203910986338cbb6c71f1abd6550dcac5a6bf156
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-29 18:27:46 +00:00
Volker Hilsheimer
094da4d84c Remove unique Android configuration from qtdeclarative.yml
The configuration is not used to test qtbase, so dependency updates
might fail if changes already in qtbase do not pass when then updating
dependencies of qtdeclarative.

This happens right now in
https://testresults.qt.io/coin/integration/qt/qtdeclarative/tasks/1677711115

If we want to enable this configuration anywhere we need to add it to
qtbase, or ideally the default list of platforms in cmake_platforms.yaml.

Change-Id: I3f5614d34def41caf1747a5f8094bac3aa2d9e2b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 905a2a9571)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-29 18:02:29 +00:00
Qt Submodule Update Bot
6e6c314bf2 Update submodules on '6.4 in qt/qt5'
Change-Id: I298d1641fafd439a101f6625b3af36c032101ebc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-28 22:50:38 +00:00
Assam Boudjelthia
642e35c7ef Coin: Fix includes in tqtc-android-automotive configuration
This broke after 8899244b8c which
unified the Android targets into one config file.

Change-Id: I9b24973ddf716f97e72d152387365c35405e0502
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 9e9f3e513b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-28 14:34:07 +00:00
Jani Heikkinen
3ed0d26425 Build android target binaries only once
- android armv7 is build only in windows
- android arm64 is build only in mac
- android x86 and android x86_64 are build only in linux

Task-number: QTBUG-101357
Change-Id: Ibfbd2e3c6d5d3a7a52dde3b35ca6c23eddf4b2f1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 8899244b8c)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-09-27 13:17:06 +03:00
Toni Saario
45749d90d5 Precheck: Fix macos android include
This broke after 8899244b8c.

Change-Id: I5cfdb2e94c8b170faba52631d9ee52cdcf7e0b36
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 5e24ed72b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-27 10:17:05 +00:00
Qt Submodule Update Bot
c9a584a6ae Update submodules on '6.4 in qt/qt5'
Change-Id: If3d82b9510d78730fdbf7a3580d46bf760150dea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-27 10:17:03 +00:00
Heikki Halmet
610f5b6270 Update Git version
We need newer ssh for RTA use. Current version has problem with
ConnectTimeout:
https://github.com/PowerShell/Win32-OpenSSH/issues/1352
Latest git version comes with OpenSSH version 9.0p1 from which this
should be fixed.

Task-number: QTQAINFRA-5038
Change-Id: I5aac1db22b1145163ee947537b363a94b86d094d
Reviewed-by: Timo Lahti <timo.lahti@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 825736dd7a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-26 14:04:05 +00:00
Johanna Äijälä
7f055aa083 Provisioning: Add Java 11 to Ubuntu20.04
Needed by RTA when compiling Android applications, minimum required
Java is 11.

Change-Id: I9a64e8de322a576d5d94593b5666d72afea8744f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit db68763094)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-26 14:04:03 +00:00
Heikki Halmet
4197afe58b Support multiple Android NDK versions
We need to verify latest Android NDK version in all
Qt6 branches and we need to retain the NDK version we
had when the specific branch was released at the first time.

Verification of the latest NDK will be done during integrations
in 'dev' branch and with older brances it will be done using
nightly build targets

Task-number: QTQAINFRA-4990
Change-Id: I2a96e419d403820f55f4244230c28ad09dc9095b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 8a72b1de99)
2022-09-23 07:23:52 +03:00
Toni Saario
2caf376cd1 Run bic tests
The way of running bic tests has changed. Now tests need to be run on
qt5 level where all modules are present and intermodule includes can
be handled.

Task-number: QTBUG-100698
Change-Id: Ic68c019988718485201602f279530c501f6e6ba3
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-09-22 09:46:16 +00:00
Toni Saario
00a0bbfc23 Remove dummy test instructions
These cause Coin to spawn VM for setting one env variable.

Change-Id: Ie782edc11382dace7a22ac16b1c58a2e9d26905f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2056362e26)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-09-22 09:46:14 +00:00
Heikki Halmet
1796efc2ac Provisioning: Install Node.js for SLES 15
WebEngine requires node.js version 12 or later

Change-Id: I9ff5ebbfcaf328445149e6d0b95e02dd0febf5c3
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit bf1c196e41)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-21 11:25:50 +00:00
Qt Submodule Update Bot
ff5ac751da Update submodules on '6.4 in qt/qt5'
Change-Id: I8fba7b996f235392110600564b8e83aecd3aa574
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-20 17:04:09 +00:00
Qt Submodule Update Bot
40bf5c6cd4 Update submodules on '6.4 in qt/qt5'
Change-Id: I20e1dcccc0a486d877350056e6f6f1b1a16eb1f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-19 19:59:56 +00:00
Ville-Pekka Karhu
c892847a08 Pre-provisioning: macOS 12 README update
Change-Id: I43194f6b2d7d6b1be74333fb9e9282adb49ed6fc
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 982b8ddb3d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-19 08:16:32 +00:00
Qt Submodule Update Bot
eb389bbaec Update submodules on '6.4 in qt/qt5'
Change-Id: I3abcae19cb25f61ebadd1849f947f1079db61da4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-16 23:52:45 +00:00
Qt Submodule Update Bot
d623ecab2b Update submodules on '6.4 in qt/qt5'
Change-Id: I89e35d86e6c02904dba8088c0859fcd8f4dd3d12
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-16 00:52:44 +00:00
Heikki Halmet
9e41c731d5 Remove SLES 15 SP3 from CI
SLES 15 SP3 will be replaced by SLES 15 SP4

Task-number: QTQAINFRA-5068
Change-Id: I60f0ec02d71d1db162f1238df7ad853ff0df2d6e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 97f8d33586)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-09-15 12:30:57 +03:00
Heikki Halmet
05450d9a26 Add SLES 15 SP4 to CI
Python-xml library was dropped out - not supported anymore.

Task-number: QTQAINFRA-5068
Change-Id: I6695b4456279143839c38637a5e67a754cafae19
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit a5b9ca03e1)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-09-15 12:30:52 +03:00
Qt Submodule Update Bot
33e7cac1b4 Update submodules on '6.4 in qt/qt5'
Change-Id: I16f4031d3da44edcf038dc09de82a8c0f9ac9321
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-14 20:54:34 +00:00
Qt Submodule Update Bot
a9971e1cdc Update submodules on '6.4 in qt/qt5'
Change-Id: Idf98dbc31e546ede2e034785de2c771385a02c6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-13 21:22:55 +00:00
Qt Submodule Update Bot
3c4b035fc0 Update submodules on '6.4 in qt/qt5'
Change-Id: Id54771b9cf6191d08743020e1e78f68dfc0a3a0c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-12 20:52:50 +00:00
Topi Reinio
dfc0d084a2 coin: Update provisioned qdoc, qtattributionsscanner binaries
Latest qdoc introduced a new command (\modulestatus) as well as other
fixes and improvements.

Change-Id: Idcbd96bc1ec17c81d51c2413f6435ee1b7e12946
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 505eb9e3a8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-12 09:19:21 +00:00
Tor Arne Vestbø
ae98acdc4b coin: Install local Homebrew formulas explicitly as formula
Otherwise we end up with scary warnings like:

Error: Failed to load cask: ./coin/provisioning/common/macos/libiodbc.rb
Cask 'libiodbc' is unreadable: wrong constant name #<Class:0x00007fb4f589d2d8>
Warning: Treating ./coin/provisioning/common/macos/libiodbc.rb as a formula.

Change-Id: Ief1b78c70367c740ce7eeca9110c3cf41372f53a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d3867057b9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-09 21:43:06 +00:00
Qt Submodule Update Bot
84b5a55a76 Update submodules on '6.4 in qt/qt5'
Change-Id: I84c836a6d05ed2a227b1564ea486942bde3a119a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-09 20:57:52 +00:00
Qt Submodule Update Bot
040cdee545 Update submodules on '6.4 in qt/qt5'
Change-Id: I00dffbdf4e7f778ea1199be9b4c5ea62bd8af6eb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-08 17:36:32 +00:00
Pasi Petäjäjärvi
7d4c4d51cb CI: Use TCP protocol by default when mounting on QNX qemu
Ubuntu 22.04 has entirely disabled using UDP protocol for NFS mounting
support and QNX mount command uses that by default.

https: //discourse.ubuntu.com/t/jammy-jellyfish-release-notes/24668

Fixes: QTBUG-104229
Change-Id: I9457153ca524009bc7358346a873b8842a65c50a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 08ba3ff882)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-09-07 23:47:47 +00:00
Assam Boudjelthia
0adae901ee Coin: Add Android OpenSSL scripts to macOS 12 provisioning target
Fixes: QTBUG-105594
Change-Id: I4980f27e216c627c1675d04ed1bb5f5b9d62f2c0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 8cc7a5f450)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-30 22:41:41 +00:00
Qt Submodule Update Bot
a92f882ec7 Update submodules on '6.4 in qt/qt5'
Change-Id: I2551b5d02071b6d043aaa62ca35e2af649b83bf3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-30 04:01:28 +00:00
Lorn Potter
30dc3e90e2 wasm: update emsdk to 3.1.14
This fixes some threading bugs

Change-Id: I8025cd96ee5737deb04a571cc35eec8b26820039
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-08-29 14:28:49 +10:00
Tatiana Borisova
2edf643736 Exclude timezone functionality from INTEGRITY build
- Device doesn't support full functionality

Change-Id: Ie0293e9d1ec9c5500e2c63e0c7ff8cc32015a454
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 41f0e6d7b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-27 06:12:20 +00:00
Heikki Halmet
a833250d59 Update Xcode version to 13.2.1 for macOS 11
This is needed for QTQAINFRA-5109

Task-number: QTQAINFRA-5109
Change-Id: I49dafa26ef2aafe6e1c9f9cab87486675283c305
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit d4602891f2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-27 06:12:19 +00:00
Qt Submodule Update Bot
b12068a544 Update submodules on '6.4 in qt/qt5'
Change-Id: I290c9827da230cf43bb03a9995cdb53f6c12c4af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-25 23:59:52 +00:00
Heikki Halmet
beaa9271a8 Include needed Platform dependency for nightly QNX_710 windows target
Change-Id: I753245ae5641a45286c394cfb2696da6796d664d
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 5af40232de)
2022-08-25 13:01:24 +03:00
Qt Submodule Update Bot
329f8f19ff Update submodules on '6.4 in qt/qt5'
Change-Id: I20c0295da3f6d34083aea73043eec595c623e7fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-24 17:23:38 +00:00
Heikki Halmet
97b6fc7f0c Fix rmt client setup to repo-clones
Change-Id: I36d8f24b19135345a2829e7521585c0cba9fc41f
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit f794796984)
2022-08-22 10:24:29 +03:00
Simo Fält
8e8e05883e Provisioning: Remove git installation from macOS 10.14
The script uses homebrew which does not support 10.14 anymore and it
fails. The git was installed due to Conan, but with TestOnly config
it does not need git.

Task-number: QTBUG-105554
Change-Id: I542780d32ebd7054c75a6afa357b3fac898b93cb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a992ba9205)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-22 04:45:11 +00:00
Qt Submodule Update Bot
3dea9c6b10 Update submodules on '6.4 in qt/qt5'
Change-Id: Icdb9c1b887292b5393b3c5f7f295ecaeadb8806b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-18 23:13:04 +00:00
Volker Hilsheimer
95014705b5 Fix calling of script creating shared folders
The calling script for each platform missed the leading ". " so
powershell never executed the script. Sadly, provisioning still
succeeded.

Add some log output to the script doing the work to verify that
the file system is what is expected to be at the end. If it's not,
then the cd'ing into the shares will fail and the script will
return with a non-zero exit.

Change-Id: I8fe85c7e202132525876cdddf41750732f69aaf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit aab85286b7)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-08-18 10:59:12 +02:00
Volker Hilsheimer
97709856d1 Add script to create shared folders for testing Qt I/O with UNC paths
Once these paths exist reliably on the Windows VM running the test, and
are shared, we can access them through UNC paths as

\\${COMPUTERNAME}\testshare

This allows us to remove dependencies to network infrastructure from
those QtCore tests.

The test needs to run last, as otherwise the Visual Studio installer
mysteriously fails to execute. So make some space at the end of the
script list.

Change-Id: Ie11b894f000722a7d99b2c5e279c1b0b63021003
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 72ac097082)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-17 19:13:25 +00:00
Heikki Halmet
4d6eb0d26d Provisioning: Update MSVC 2019 version to 16.11.18 in Tier 1
Older version seems to have issues with installer when updating
the visual studio and buildtools versions through installer via
command line.

Task-number: QTQAINFRA-5090
Change-Id: Iaec5391ed7bc9780374a7f971624522dae2feee6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 0507008ff6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-17 16:01:17 +00:00
Qt Submodule Update Bot
529df4c2d9 Update submodules on '6.4 in qt/qt5'
Change-Id: Iea425e039a01c5f1816ced0a229ff5411babb22f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-17 04:19:12 +00:00
Qt Submodule Update Bot
cfefed8b3c Update submodules on '6.4 in qt/qt5'
Change-Id: I4b0fa3aecf4a06a0cd1eb1350ab95a85781b403c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-11 19:30:35 +00:00
Alexey Edelev
188e774a60 Use macOS version from the packaging rules to build Qt
Use macOS 12 as the building platform for Qt. macOS 10.14 will be
deprecated as the building platform in Qt 6.5.

Change-Id: I14d850a489efced84aa1e7e294d2ae75f5efa3de
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit c0ecadc049)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-10 09:26:20 +00:00
Qt Submodule Update Bot
af17636e41 Update submodules on '6.4 in qt/qt5'
Change-Id: I8fd25f81e495872caf3785d53e7a7e6454472f4f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-09 13:08:11 +00:00
Qt Submodule Update Bot
394513f76c Update submodules on '6.4 in qt/qt5'
Change-Id: I528f7a95fe2e0495bb274740f72bc3232fa12cd9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-09 01:08:31 +00:00
Tor Arne Vestbø
43d825d7dc coin: Build and test iOS on macOS 12
Ensures a recent Xcode version is used.

Change-Id: I15b82417d336af3ea9ad385bd6d1f4e08d64c6c0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 860bd111e2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-05 00:22:51 +00:00
Qt Submodule Update Bot
f671f6cf00 Update submodules on '6.4 in qt/qt5'
Change-Id: I57da7794b2073ae1953f2ff89f3111849504a547
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-03 15:21:52 +00:00
Qt Submodule Update Bot
a1b421d720 Update submodules on '6.4 in qt/qt5'
Change-Id: If12265d9b7b35c3647e03d1ef4bf14f10a1ef1cd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-28 22:35:12 +00:00
Qt Submodule Update Bot
86927357db Update submodules on '6.4 in qt/qt5'
Change-Id: I09fceb825910f9b698d62b6264c3a361b52b9dfe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-27 13:01:48 +00:00
Qt Submodule Update Bot
af45c0238f Update submodules on '6.4 in qt/qt5'
Change-Id: I6432d098c588e4d6bdcb7bc332ebdc9842694493
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-25 21:08:24 +00:00
Simo Fält
495d13836c COIN: Replace macos-12-arm64-tests with x86_64 in default precheck
There is a shortage of arm based Mac machines in CI so we have
to spare the resources for now.

Change-Id: Ifda8d6fb5ef3224dd001c6bdf2cf2cd14b8cff8a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit b830beb222)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-21 15:39:28 +00:00
Axel Spoerl
0a784ca073 Harden cache delete script and extend to all Linux CI platforms
Log script activities and deleted toplevel cache files/directories.
Use sudo to override permissions in cache.
Remove legacy single file based cache if it exists by error.
Create cache directory with appropriate permissions if missing.

Change-Id: Id6ad930bf8ba9233eeea8a7602d25c98d0058409
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit aa9095d4cd)
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-07-21 06:02:13 +00:00
Assam Boudjelthia
164913b5d9 Coin:Android: Use VMSize8 for Android test targets
Ensure to explicitly use 8 cores for Android targets runnining
tests to reduce the amount of flaky fails due to the emulator
crashing or freezing.

Task-number: COIN-896
Change-Id: I8b0cfac34aa7fc416166b9f7ae0b3e9d72c62e55
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 39efd3c35f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-19 23:33:39 +00:00
Qt Submodule Update Bot
f87f7ac4df Update submodules on '6.4 in qt/qt5'
Change-Id: I832866843da361c42a383126db3388d1f0bcf7d2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-19 22:55:51 +00:00
Alexandru Croitor
2a283fe990 coin: Use configure for newly added mac configuration
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Amends 21ed2db77b

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: Ibd4ae9bb7dfdbff0cc1ae7803a6aaf5e0c504d2e
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 032dfe48fa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-18 15:51:38 +00:00
Simo Fält
d691ac62a8 Use gold linker with Android Automotive documentation config
Change-Id: I8d282e015a0e195da2ad764516d3df1a48e6bff7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2f3432fe0d)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-07-18 12:09:30 +03:00
Axel Spoerl
fc81f627ce Provision flite library on openSuSE Leap 15.3
Add flite install script for linux and integrate it in provisioning
for openSuSE Leap 15.3.

Change-Id: Ie99271b115ba5c7b1f0177e09f38a4729de2b6cd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 171a3e85f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-17 07:14:07 +00:00
Assam Boudjelthia
531c63fb3e Use 4 CPU cores for tqtc-android-automotive test VM
The current cores count is 2 and that's leading to failures
in tests execution.

Change-Id: Ia442c66f0c6246114f43f812240ad469dc705424
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit dcc3d699fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-15 17:39:43 +00:00
Qt Submodule Update Bot
43cb6f9c28 Update submodules on '6.4 in qt/qt5'
Change-Id: I8bde7a7bd560b465c2b1b5e652c0eb504487d73f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-15 14:21:58 +00:00
Samuli Piippo
072181ed44 QNX: generate wrapper scripts for all hosts
The QNX build done on linux host can be used in installer for all host,
make sure that the wrapper scripts are also available for all hosts.

Change-Id: I564b66682cdfd514e165dfb1542683e9a542a53d
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 4ec187cd4c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-15 06:32:30 +00:00
Qt Submodule Update Bot
dc32086084 Update submodules on '6.4 in qt/qt5'
Change-Id: Ie68ea290d6da4383eb5b025a0c16e37fef9bd7e2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-14 02:11:13 +00:00
Allan Sandfeld Jensen
09c4895c82 Use gold linker on Ubuntu 20.04 developer build
Faster, uses less memory, and has better debugging. Also needed to link
qtwebengine debug-builds on this arch.

Change-Id: I337798a9191cb4a764de4b0251349e4e86b0288a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 49e7ee7913)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2022-07-13 14:33:34 +02:00
Assam Boudjelthia
fcc4b8fdda Coin:Android: Enable tests for default packaging target - Part 5
This makes sure Android tests are run by default for packaging
targets for various integrations including qt5 integrations and
potential issues are caught up early on especially when doing
sumobules updates and coin scripts updates.

Also, this makes it easier to manage instead of having the tests
enabled per module. Thus, this removes the Android test include
from the individual modules because it will be retrieved directly
from cmake_platforms_target_android_host_linux.yaml which is included
by cmake_platforms.yaml.

Task-number: QTBUG-88846
Change-Id: I8bc1638df48ad27781160df943c0126ffe495a3e
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 1d4f821520)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-07-08 14:29:55 +00:00
Qt Submodule Update Bot
0940de7755 Update submodules on '6.4 in qt/qt5'
Change-Id: I5c32687f9990fcd663b9a7731f28a4af9a3db015
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-07 05:33:47 +00:00
Jukka Jokiniva
b035f60066 Revert "Change QNX temporarily insignificant"
This reverts commit 60cb5adc2e.

Reason for revert: QNX licenses fixed

Change-Id: I50bdff9b416c10d0a9181cded524c37681a8723e
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 9aa0ec5040)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-05 12:19:15 +00:00
Jukka Jokiniva
9f38c997dc Change QNX temporarily insignificant
QNX licenses expired. Temporarily remove QNX from
blocking CI.

Change-Id: I96f9b2d4c07c1921736c929971ec1e716d7d6131
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
(cherry picked from commit 60cb5adc2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-05 05:02:17 +00:00
Qt Submodule Update Bot
0c717c1426 Update submodules on '6.4 in qt/qt5'
Change-Id: I6961497b50e5cb5e25fe36a43fbe78abbea0570a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-29 01:39:14 +00:00
Eike Ziller
898d152739 COIN/Qt Creator: Run tests
Change-Id: I73247d88fcd5539c2d3748af7619c2223c237d9c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
(cherry picked from commit 58ebc95561)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-28 09:20:52 +00:00
Andreas Buhr
7ac98ea0bb Also let Linux Android developer build use configure
Change-Id: I31bfab26a28aa60354608dfe6531d9605f556c33
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 65f50d4d22)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-23 05:41:10 +00:00
Qt Submodule Update Bot
aa516e5187 Update submodules on '6.4 in qt/qt5'
Change-Id: I0f8529928677e846ca3bea0091b97706c1d095fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-23 02:28:41 +00:00
Tommi Mänttäri
458bf1b1bd CI: make Linux host builds to use the common QNX SDP
To ensure that both Linux and Windows host builds are equivalent
the Linux host builds need to use the common QNX SDP file that
support both host environments.

Task-number: QTBUG-101292
Change-Id: Iaf3fe0de1bce64918165555bff07f5cb423fef32
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit e487623c0d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-22 10:14:56 +00:00
Tommi Mänttäri
2028583940 CI Nightly: add Windows host support for QNX
Add required configurations to Nightly run for building
Qt SW in Windows host for QNX OS.

Task-number: QTBUG-101292
Change-Id: I689abd6596bf1ab1f30ba07c198e12569dbf2164
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 857ae6e1e1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-22 10:14:50 +00:00
Joerg Bornemann
71e4b8f2e6 CMake: Take custom libdir into account
When configuring with -libdir set to something that is not recognized
by CMake's find_package search procedure, top-level builds failed to
configure.  This was due to a hard-coded lib/cmake directory added to
CMAKE_PREFIX_PATH.

Fixes: QTBUG-103823
Change-Id: If8b48e35e654089f32cbe4af9936238cd82b3dbb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 96be84d703)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-20 18:20:31 +00:00
Kai Köhne
1e198615f6 Make sure clang-format doesn't reformat SPDX-License-Identifier
SPDX-License-Identifier needs to stay on one line to be machine
readable, even if this goes above the 100 chars limit.

Change-Id: I2cc3d556e30e8d169224cc87a97a2042b47e43f7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 6a4dab1134)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-20 09:31:10 +00:00
Qt Submodule Update Bot
f7ce76453b Update submodules on '6.4 in qt/qt5'
Change-Id: I50d83aaf76d3b8f5ef1be622f6bc367f6a61001a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-16 22:51:33 +00:00
Toni Saario
6e5bc38ab1 Precheck: Run only configs used in cmake_platforms.yaml
Most of the modules do not have all configurations from different
yamls. Using configs from yamls only used in some modules will
lead to precheck using configs which are not used on normal
integrations.

Change-Id: I7712db05eee485692d0363326194f02e21a40b9a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit e9b5cfc634)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-16 15:21:32 +00:00
Alexandru Croitor
b7db0810d3 coin: Fix android automotive configuration to use configure
The UseConfigure feature was enabled, but the configure arguments were
not ported.

Amends 5e9653ef97

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I89607aef275370dc27910a5cd1fec7603a1fd576
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 6e95fb2f93)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-15 19:06:29 +02:00
Alexandru Croitor
d44de19ead coin: Use configure for QEMU Boot2Qt configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I9aacf3e6f15fc074b52e85da9e3f671b4f58a135
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 64cf9a03b7)
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-06-15 19:06:29 +02:00
Toni Saario
8fe851289c Coin: Add precheck yaml
Defines configurations that will run on default precheck.

Change-Id: Idb7d3981b2679c3714f86a92808e90fe33aaf136
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 43a461de46)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-14 07:33:55 +00:00
Jani Heikkinen
e57ed21365 Update qthttpserver
Change-Id: I232c9f1e6b229d51db0ee7dd337627620c601c96
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-06-13 07:55:56 +03:00
Alexandru Croitor
c50755aabc coin: Fix iOS tests configuration to pass -debug-and-release
Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I578e1238ea187ade908d8174c0c6e5f7a9a9f66f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 6b2298dacf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-12 18:01:17 +00:00
Qt Submodule Update Bot
65a882504d Update submodules on '6.4 in qt/qt5'
Change-Id: I51e3aef409b45ed32fdb9dcd27e8229fa4fb9c43
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-12 00:37:48 +00:00
Qt Submodule Update Bot
1e6d516cd9 Update submodules on '6.4 in qt/qt5'
Change-Id: I143e37a37d8baf0a576ff43043926186c7253bf9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-11 06:12:46 +00:00
Alexandru Croitor
56a0c2c146 coin: Use configure for Windows MinGW + GCC configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

As a drive-by, remove the qt tiff option from qtbase configure args.
The feature is only available in qtimageformats.

Amends a97bdde4d4 and
4b4f0be08d

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I722bd869315b9059f5cadc5e935ed5173edf370d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit bcada10a9e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 17:15:26 +00:00
Alexandru Croitor
b2795bddfc coin: Use configure for Integrity configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I128f5e424481ba8fbb4649c75be818abee57e03e
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 6ec880ea47)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 17:15:26 +00:00
Alexandru Croitor
b4333b6cd7 coin: Use configure for QNX configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: Ibb84a88f7f1ebd1f98e9998fac4180b257e80461
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 7c9601115d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 17:15:26 +00:00
Alexandru Croitor
91ebdeed2a coin: Use configure for WASM configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I534b630946f1fd9f79e8466886ea727697cabbc4
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 615091a6a8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 17:15:26 +00:00
Alexandru Croitor
b38ff4e4d7 coin: Use configure for Android automotive configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I6fa9d75fab32f7355847a09996876f7e6c0a8b1c
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 5e9653ef97)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 17:15:26 +00:00
Alexandru Croitor
a7be4fc035 coin: Use configure for Android configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I008dd8dfca800e94ea3448bfd2c7ebae3266983e
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit d65844f4a2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 17:15:26 +00:00
Alexandru Croitor
660cc3716d coin: Use configure for static tests configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I2d35724074f4180775ca28c4befea1b9de838ecf
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 2566bbfe71)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 17:15:26 +00:00
Alexandru Croitor
01af766dc5 coin: Use configure for Windows MinGW + LLVM configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

As a drive-by, remove the qt tiff option from qtbase configure args.
The feature is only available in qtimageformats.

Amends a97bdde4d4 and
4b4f0be08d

Also remove redundant compiler launcher assignments.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I5cfcf5ddf60e9dd77cb67f41bb75525b44ad78d3
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 98bcf11bf8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 17:15:26 +00:00
Alexandru Croitor
12c753f66f coin: Use configure for Windows MSVC arm64 configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

As a drive-by, remove compiler launcher assignments. They are
handled automatically by the qtbase instructions.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: Id7b02804aa2c931e81f227cae64b19ab0e40f82d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit ce76bcd8e2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 00:48:09 +00:00
Alexandru Croitor
82bfd2e9c6 coin: Use configure for Windows MSVC desktop configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I153b9268f8795c33a44f85a316fa7c1c31ac0492
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit aa0c9d4943)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 00:48:03 +00:00
Alexandru Croitor
871770d03d coin: Use configure for macOS desktop configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I38e038e6682f77a5ea3f2335f24f8bcbd2e7c605
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit e0c0aaade4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 00:47:57 +00:00
Alexandru Croitor
0459819d99 coin: Use configure for RHEL configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I1fef5b57c493d1e32080fad393e4e531e441e142
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 4810eb2f61)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 00:47:56 +00:00
Alexandru Croitor
4e5d6a7d91 coin: Use configure for OpenSUSE and SLES configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: Ia2461f24ba526702196f72ea492b59cc2b1abf5a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 6d6eccab34)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 00:47:51 +00:00
Alexandru Croitor
785e271771 coin: Use configure for iOS configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: If84d580bdcf166f07ecd1f6fb20e3404e1fb0e1c
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 07f418d415)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 00:47:50 +00:00
Alexandru Croitor
69e123b11c coin: Use configure for Ubuntu desktop configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I2620014c3858c1f343f8698fc3f8de4f9188ad4b
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 99731bc155)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-09 00:47:44 +00:00
Jani Heikkinen
05a4597139 Adjust submodule branches
Change-Id: Id14a810bd5c98c6b264be274670afb4a99cf1347
2022-06-06 10:07:01 +03:00
Tatiana Borisova
2046e36ee9 For qglobal.h: include <stdalign.h> in C mode C11 support is required
- add C11 standard in use by GHS compiler

Change-Id: Ied36da57617897c0c2553b6e2a9dd1206ca65d34
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-06-03 13:35:55 +03:00
Qt Submodule Update Bot
c12065ac78 Update submodules on 'dev in qt/qt5'
Change-Id: I3d4b041b668dcefbe9335fda4ad9bae90b319959
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-01 12:42:30 +00:00
Lorn Potter
b6b127c2d9 wasm: update emscripten version to 3.1.10
Qt 6.4.0 will require emscripten 3.1.10

Change-Id: I9411902674104aae8f4ba3b6af11e9956932d6b9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-05-27 08:31:33 +10:00
Jani Heikkinen
b1a7f2e737 Add qtquick3dphysics submodule
Task-number: QTBUG-103176
Change-Id: Id84b70e33a65d45734e9725628f5d5edfeef6bb6
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-05-25 08:16:26 +03:00
Simo Fält
0c85cce1b3 Provisioning: Install additional python3.7 for Windows 11
Pick-to: 6.2 6.3
Change-Id: Ia8ba4cee4efd6e9c8ffe5403879ad585b6e97576
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2022-05-25 06:42:25 +02:00
Allan Sandfeld Jensen
21ed2db77b Test universal builds on arm64
Change-Id: I2c2cc2a58cd954c8884955cd8bed79a961ef901b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-05-25 05:42:22 +01:00
Assam Boudjelthia
178334bd29 Coin:Android: Enable tests for more modules - Part 4
This adds tests of more modules:
qtcharts, qtspeech, qtwebchannel, qtwebsockets, qtdatavis3d

Pick-to: 6.2 6.3
Task-number: QTBUG-88846
Change-Id: Ie98ad9af7c260a72e9309836b7733106254da38a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-05-19 08:32:18 +00:00
Andreas Buhr
fb2ad5889e Activate testing of developer build for Android in qtdeclarative
Pick-to: 6.2 6.3
Fixes: QTBUG-101865
Fixes: QTBUG-102943
Change-Id: Ib6a2345f77b52749c5e7945d19e2eaa52e311758
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-05-18 14:29:34 +02:00
Qt Submodule Update Bot
2580f6984f Update submodules on 'dev in qt/qt5'
Change-Id: I95a31bf8725337e37938f49b4799b6e21f22622c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-16 14:51:22 +00:00
Jani Heikkinen
e70c24cd88 Add qtquick3dphysics platforms
Task-number: QTBUG-103174
Change-Id: Ic72f8a6b0d72ade656a39165c8feeaf01d73f51b
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2022-05-13 11:53:46 +00:00
Qt Submodule Update Bot
22b2c116c6 Update submodules on 'dev in qt/qt5'
Change-Id: I2ebacc15027622ea49ac125870fcf5d86c7090e1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-13 00:45:23 +00:00
Jani Heikkinen
19ecbff332 Add tqtc-qtvncserver platforms
Task-number: QTBUG-103163
Change-Id: Ifb2fe0842afa5077bd52e235fbe89d425c5c6203
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2022-05-12 07:39:35 +03:00
Assam Boudjelthia
10143120c1 Coin:Android: Enable tests for more modules - Part 3
This adds tests of more modules:
qtquick3d, qtremoteobjects, qtcoap, qtlottie, qtmultimedia,
qtnetworkauth, qtserialport, qtwebview.

Pick-to: 6.2 6.3
Task-number: QTBUG-88846
Fixes: QTBUG-100448
Fixes: QTBUG-100449
Change-Id: I0804b5be4bf17684a3d307e0a024304fa108af94
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-05-06 10:13:54 +00:00
Morten Johan Sørvig
b9a7cd83ee wasm: add thread-asyncify build variant
Add thread-asyncify build variant for the linux host. This configuration
will be used for running auto-tests, and may also be packaged for
distribution in the installer at a future point in time.

The config options are:
 thread:   -DFEATURE_thread=ON
 asyncify: -DQT_QMAKE_DEVICE_OPTIONS="QT_EMSCRIPTEN_ASYNCIFY=1"

Task-number: QTQAINFRA-4876
Change-Id: Id3ab3134ddd1cb47cf0ae9ac4cd3db239cdde01f
Reviewed-by: David Skoland <david.skoland@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-05-04 17:06:40 +00:00
Ievgenii Meshcheriakov
c3b063a6f2 Add qthttpserver module as preview
The module provides API for implementing a lightweight HTTP server
in Qt programs.

Task-number: QTBUG-100994
Change-Id: Ic382db6706c61581e70936f97b34eb318b95584a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
2022-05-04 10:34:29 +02:00
Pasi Petäjäjärvi
b42e533a6f CI: Make QNX 710 x86_64 significant
Pick-to: 6.2 6.3
Task-number: QTQAINFRA-4838
Change-Id: Ib75847afdf6ec4dea32f6b232f53768d2d5df2f9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-05-03 08:33:23 +03:00
Heikki Halmet
e5b819e26d Disable Software Updates for macOS
Pick-to: 6.3 6.2 5.15
Change-Id: Id80d66cfebaa17311d7bfd927f3ce33ba0b81661
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-05-03 08:33:22 +03:00
Piotr Srebrny
9196022e01 Make Copy-Item to throw exception if source does not exist
Copy-Item command does not throw by default. Thus, copying error is
not caught and the Download function returns without downloading from
the official site. Adding "-errorAction stop" makes Copy-Item to throw
an exception as expected in the script.

Change-Id: I889cccac775705613e641453aca9e0197645f344
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-04-29 13:06:03 +00:00
Alexandru Croitor
30068f2223 CMake: Normalize submodule names by stripping tqtc- prefixes
In tqtc repos, the dependencies.yaml files may point to tqtc- prefixed
repos, which can lead to build failures when doing a top-level build
and the local repo directory names have no tqtc- prefix.

This is the case both in the CI, and when using init-repository or
git submodule init --recursive, because qt5.git specifies the 'path'
key for each submodule to not contain any tqtc- prefix.

Normalize the repo names by removing the tqtc- prefix when doing
dependency resolution for CMake add_subdirectory calls, if such a
submodule name does not exist on-disk.
The normalization is conditional, to allow inclusion of repos that
don't have a non-tqtc mirror.

qt_internal_sync_to and the other git related operations
are currently broken (both before and after this change) when
used in conjunction with tqtc- repos and is non-trivial to fix.

The first problem is the assumption of using the 'origin' remote,
which will likely be an open-source repo that doesn't contain
any tqtc repos.

The second problem is that we would need to agree upon requiring
2 remotes, one open source and one tqtc one, to reliably choose
where to clone / fetch from, as well as determining whether
the checked out repo name needs to have a tqtc- prefix
(by checking whether the repo does not exist in the open source
remote for commercial only repos).

Alternatively we could hard code a list of known open source repos,
and anything not in the list will have its tqtc- prefix kept, but we
still need to know which remote to use.

As a drive-by, adjusted some of the shown messages for better
readability and easier grepping.

Pick-to: 6.2 6.3
Fixes: QTBUG-102883
Change-Id: I6806b119dd32b14dc0d9711dc829bfc5130d1e6f
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-04-28 19:27:59 +02:00
Simo Fält
052ef1bd9f Provisioning: Install python2 for arm mac also
We already use pyenv for installing pytho3 for arm macs, so it is
natural to use the same with python2. Also combining both provisioning
scripts as one, while python2 is already at the end of its lifespan and
should be removed completely from CI nodes.

Task-number: QTQAINFRA-4861
Change-Id: I0f2f73b974a83f8d3f0d42cb02d3b73e5ff82b17
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-04-27 11:38:20 +02:00
Jani Heikkinen
5bce721efe Update LA 4.4.1
Task-number: QTBUG-101714
Change-Id: I4b9a88be5bfda3b542d9c10c51cc94f36dade932
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Santtu Ahonen <santtu.ahonen@qt.io>
(cherry picked from commit 1734139bf4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-26 20:45:32 +00:00
Qt Submodule Update Bot
06e00e9621 Update submodules on 'dev in qt/qt5'
Change-Id: Ie6d36c662750d2020b6f679abaf3bd46097aefa8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-26 20:45:30 +00:00
Volker Hilsheimer
314d2c5c27 Enable the qtspeech submodule as an add-on
Change-Id: Ie20dfb89f4e90913ae0d5f6230659d22c9fd08c0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-04-22 17:14:38 +02:00
Tatiana Borisova
2d7bba81c0 Update CI environment for INTEGRITY
- Add libplanedef, libmmosalfile, libOSAbstraction, libopenwfd, libpmem libraries into environment
- updated integrity_toolchain.cmake paths according existing CI folder structure

Pick-to: 6.3
Change-Id: Icda1a82f9d9afda38a3556f23d2f141ef2965c44
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-04-20 19:19:34 +03:00
Tatiana Borisova
4cb9ded166 Improve INTEGRITY cmake toolchain file
- Add possibility do not create megapack.a library
  manually for work with INTEGRITY framework.
- add 'frigor=accurate' option to control vectorization
  of floating-point calculations
- fix olink typo

Pick-to: 6.2 6.3
Change-Id: I67561e438d6f12ed62b6b41742970bdf38d0011c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-04-20 10:57:10 +03:00
Heikki Halmet
66725b2895 Update llvm-mingw package to official version
Pick-to: 6.3 6.2
Change-Id: I6083bd46871bc9f08e5b856aea5ed3b567cb5e53
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-04-19 09:53:03 +03:00
Heikki Halmet
789c276431 Update NDK to r23b
This also fixes Android OpenSSL installation

NDK update will be added only to dev and 6.3 branches

Task-number: QTQAINFRA-4837
Change-Id: I1233217e71f345d30f3dec83d7477d3c6e3b6c2d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-04-12 11:45:04 +00:00
Alexandru Croitor
2ee43055ed coin: Allow using configure instead of cmake for top-level builds
This is the qt5 counterpart to the qtbase instructions to allow
using configure instead of cmake when configuring a top-level build.

Pick-to: 6.2 6.3
Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: Ie5af31f9349a6dd88fa7699d40dad659180814e2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-04-11 17:27:49 +02:00
Heikki Halmet
12a87cba0a Provisioning: Install Android 11 automotive emulator
This is needed after moving from internal tqtc-qt5 branches to qt5.
Android 11 image was built internally.

Pick-to: 6.3 6.2
Task-number: QTQAINFRA-4343
Change-Id: Ie0c4c5853079303ef9d4537f3b7b06ab62f14e3b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-04-08 08:15:19 +00:00
Tor Arne Vestbø
3072446274 coin: Run macOS x86_64 developer build tests for all modules
Aligns the way we test x86_64 and arm64 developer builds.

Pick-to: 6.2 6.3
Change-Id: I87ea5e183b5ee29c62304b22eaf20c4b46ec3b0d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-04-07 08:02:47 +01:00
Qt Submodule Update Bot
4d4ad69ba1 Update submodules on 'dev in qt/qt5'
Change-Id: If38aa9c2fbfce2a2826b54517ba3ecc5a96cab74
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-06 20:57:19 +00:00
Alexandru Croitor
0cfa1fa561 CMake: Switch an OpenSUSE config to build with CMake 3.16.8
To ensure we don't introduce regressions building Qt with the lowest
version of CMake that we support.

Pick-to: 6.2 6.3
Task-number: QTQAINFRA-4844
Task-number: COIN-823
Change-Id: I59b6a0ed6851a5fbed701c4f6ea050062bddb773
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-04-05 22:37:46 +02:00
Alexandru Croitor
75bab52bb9 CMake: Provision minimum supported CMake version 3.16 on OpenSUSE
This will allow us to switch one of the Linux OpenSUSE platform
configurations to build with an older version of CMake, to ensure
we don't introduce regressions.

Pick-to: 6.2 6.3
Task-number: QTQAINFRA-4844
Change-Id: I2aa51175e3c393af079ab1d2b4648ced1fdf6a4a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-04-05 22:37:46 +02:00
Alexandru Croitor
5ab5cea6b3 Add CI platform configurations for the qmake2cmake repo
Adds Linux RHEL and macOS desktop platforms to run the qmake2cmake
tests and linters, as well one more configuration for the
license check.

Ubuntu doesn't quite work out of the box. Same for Windows.
They will be added later.

Change-Id: Id37d2ca6512ea8b7564dfa05b4bd6c49cadf96a5
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-04-05 22:37:46 +02:00
Simo Fält
bfc49c207d Provisioning: Update cmake to 3.21.3 to enable Android build
To avoid https://gitlab.kitware.com/cmake/cmake/-/issues/22634.

Pick-to: 6.2 6.3
Change-Id: I1227218514174843353b5bd5d831d89ed1ca89b4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-04-04 23:16:47 +03:00
Heikki Halmet
d6a7527384 Make Windows 11 21H2 significant
Pick-to: 6.3 6.2
Task-number: QTQAINFRA-4673
Change-Id: I7eebc889dbc9ecc7c741147a2703575b5bfeb04d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-04-04 14:54:51 +03:00
Eike Ziller
e2b2c06558 COIN/QtCreator: Add machine for Qt 5 based build
Since we still support Qt 5 based builds of Qt Creator, we'd like
to have that combination as part of the precheck.

Pick-to: 6.3 6.2
Change-Id: I8f752f6e2aff4bebd644a87a1f51255ca482d337
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-04-01 12:56:04 +02:00
Qt Submodule Update Bot
62be787f95 Update submodules on 'dev in qt/qt5'
Change-Id: I601d4f80cf324a98adb12f3ccf00702d60086ca6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-01 02:04:17 +00:00
Pasi Petäjäjärvi
45a92d5f26 CI: Add QtCoap network testservers for QNX QEMU
Pick-to: 6.2 6.3
Change-Id: Ibc18edaf4a1d9dec309396eb80744b6a21738382
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-31 14:42:44 +03:00
Heikki Halmet
f8311eaadf Provisioning: Install Chromedriver Chromium
This is needed by WebAssembly

Pick-to: 6.3 6.2
Change-Id: I3e828d643d2780308514b2939db5a1b4032c66ac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: David Skoland <david.skoland@qt.io>
2022-03-31 07:35:40 +03:00
Assam Boudjelthia
807b259ea4 Add Android tests to Qt modules - part 2
The following modules are passing CI, so enabling them is possible
now; qt3d, qtconnectivity, qtmqtt, qtquicktimeline, qtsensors,
qtserialbus, qt5compat, qtpositioning, qtscxml, qttranslations.

Task-number: QTBUG-88846
Pick-to: 6.2 6.3
Change-Id: Ic1048d0fadd551f42ef2d074b3b905cf3c8da339
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-03-29 21:32:22 +02:00
Alexandru Croitor
cae9fef6f0 coin: QNX is not warnings clean
WarningsAreErrors was accidentally added to a QNX platform config,
despite it not being warnings clean.
The integration still passed though, because Coin didn't add
-warnings-are-errors to configure when cross-compiling.
Even if it did, it would still not be enabled, because the CMake
integration is missing -Werror support for QNX.

Remove the feature from the QNX platform config so there is no
confusion.

Amends 4b5a972ae4

Change-Id: Id72e446b75283d02a9724d4fec1b54f692e94fde
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-03-29 19:00:56 +01:00
Pasi Petäjäjärvi
6f5c0fbdf0 CI: Add dns entry for network test server (not docker)
Servername qt-test-server is still used as local server name in tests
like networkselftest.

Pick-to: 6.2 6.3
Change-Id: Iadda2254d4a45e95f90523cae90518fa74b24d6c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2022-03-26 20:49:15 +02:00
Pasi Petäjäjärvi
c1e7cf5c25 CI: Add current directory to PATH because security update for QProcess
Because of 29fceed2ffb41954a63001414bd042611f2d4980 now all tests that
use binaries local to test folder will fail. Add current directory to
ssh connection PATH to fix this. On other platforms than QNX, this
happens to work as function qt_internal_collect_command_environment
sets the absolute directory path of external binary to PATH. Still tests
would fail when running directly tst_* binary instead via ctest.

Pick-to: 6.2 6.3
Change-Id: I670d78a2a4362dc8d6faf271f2ad2a90ce2a8aa9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-26 11:31:35 +00:00
Heikki Halmet
13a877d4d9 Add prebuilt Android OpenSSL package for OpenSSL 1.1.1m
Used OpenSSL source package 1.1.1m was changed little bit. All
ANDROID_NDK_HOME strings were replaced with ANDROID_NDK_ROOT in
Configurations/15-android.conf file

Task-number: QTQAINFRA-4864
Task-number: QTBUG-101863
Change-Id: Ia3d82005734ba69f1cc85708c867ae1955938739
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 686481f48c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-24 04:51:15 +00:00
Cristian Adam
c76e26a5fa Update MinGW 11.2.0 to rev3
Revision 3 updates gdb to version 11.2.0.

This is not necessarily needed for building, but I think it's better to
have the same toolchain as the Qt SDK.

Task-number: QTBUG-101653
Pick-to: 6.3 6.2
Change-Id: I92a319a943d18ec10e5e0da3cd770ba7cde26f13
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-03-21 11:50:50 +01:00
Fabian Kosmale
14e486a8c4 Set QT_SUPERBUILD early
That will allow qtbase's .cmake.conf to check whether it is meant to be
used in a superbuild or only for qtbase.

Task-number: QTBUG-101640
Pick-to: 6.2 6.3
Change-Id: I035c86f32497004cc1b8441456604106bacadad4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-03-18 12:18:54 +01:00
Simo Fält
5d53c917b0 Install python3.8 compatible wheels to wheel cache
Pick-to: 6.3
Change-Id: I42283e1aa9d731e86adccaef3baed25713c9b60d
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2022-03-16 08:16:40 +00:00
Kai Köhne
4b5a972ae4 Explicitly opt in to WarningsAreErrors
Use the WarningsAreErrors feature, instead of relying on
FEATURE_developer_build, to block changes that introduce compiler
warnings.

Task-number: QTBUG-101073
Change-Id: Iab3a64fb51ac22ea8474c7b53ef0c8087397b981
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-03-15 09:47:09 +01:00
Pasi Petäjäjärvi
339a47b4ed CI: Add ssl certificates for QNX
Expects Ubuntu 20.04 LTS with ca-certificates package installed

Pick-to: 6.2 6.3
Change-Id: I9b439e9e049b93c3bba77573b491c336aee4af5a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-14 09:01:00 +02:00
Pasi Petäjäjärvi
477877352a CI: Add network autotests support for QNX
Add regular UNIX network related files to configure
used test network based around QEMU and docker
services. IP address 172.31.1.1 is bridge interface
address in host which QNX tool mkqnximage set
(hard coded intool, cannot be changed).
Docker service hostnames are configured statically
as mDNS does not work from QEMU.

Pick-to: 6.2 6.3
Change-Id: Id7be7867e5bea1f354456e8d440f9979c402e977
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-14 09:00:55 +02:00
Pasi Petäjäjärvi
c4869161b6 CI: Remove installation of QNX toolchain from linux platforms
These linux platforms are not used when building for QNX

Pick-to: 6.2 6.3
Change-Id: I071834053b09b1cea962796076bb0cd2fc6e0fff
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-03-14 07:00:50 +00:00
Morten Johan Sørvig
53493a2351 wasm: upgrade emsdk version to 3.1.6
3.0.0 has a critical bug which can cause linking failures
(see QTBUG-101267). Update to the most recent version
where the bug has been fixed.

Task-number: QTBUG-101267
Pick-to: 6.3
Change-Id: Ib2e6abb72eb50b77db63175bbbf4a88b5e3c3920
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2022-03-12 16:10:12 +00:00
Assam Boudjelthia
523eb8e1ea Add Android tests to Qt modules - part 1
This enables testing for Android for the modules:
qtdeclarative, qtsvg, qtshadertools, qtimageformats, qtlanguageserver.

Also replace the qtbase Android test target with
linux_android_tests.yaml.

Task-number: QTBUG-88846
Pick-to: 6.3 6.2
Change-Id: Ibe0dcbdc5d468e884570bf4908f8ddee0793103c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-03-08 17:03:43 +02:00
Ievgenii Meshcheriakov
e5ecdd605e Add pcsc-lite-devel to the RHEL 8.4 package list
PCSCLite is needed to enable optional PCSC support for QtNfc.

Task-number: QTBUG-97946
Change-Id: Id27eea5e28a88b03399b5c1d66ea6fe4d077ea43
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-03-08 16:03:43 +01:00
Heikki Halmet
96fe74b540 Fix Openssl android installation
Current provisioning installation is broken. Current package replaced
the old openssl-android-master-1.1.1m.zip and shasum changed.

Pick-to: 6.3 6.2 5.15
Task-number: QTQAINFRA-4848
Change-Id: Id5e3bc1a81f8b634668d189c7647eac7c612020a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-03-08 08:46:58 +02:00
Simo Fält
e1f18be950 Provisioning: Make sure one can call virtualenv as module with python3.8
This will fix qtinterfaceframework's config test.

Pick-to: 6.3
Change-Id: Ifd2f52e27d31f140402d98861339ef5f7b253c23
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2022-03-07 14:52:48 +02:00
Simo Fält
171f29f091 Provisioning: Install additional Python 3.8 for RHEL 8.4
Pick-to: 6.3
Change-Id: Ic9893505d3805bcc3cbed972a95ce4a756e4c32a
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-03-04 07:29:53 +00:00
Alexandru Croitor
a9c9418c8a coin: Split top-level build instructions
Makes it a bit cleaner to follow.

Pick-to: 6.2 6.3
Change-Id: I063581126b6d09f98fb38862c8af5531dc513aca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-03-02 16:14:20 +01:00
Qt Submodule Update Bot
ad4484c1ba Update submodules on 'dev in qt/qt5'
Change-Id: I1ec8e7626705e4ffc14e8663c4fa27e9b4b7e8b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-01 06:15:02 +00:00
Jani Heikkinen
cbeea07854 Update LICENSE.QT-LICENSE-AGREEMENT
Newest version is 4.4 so update it in the git as well

Task-number: QTBUG-98971
Pick-to: 6.3 6.2 5.15
Change-Id: I55f06da7778fe8ce9c7c449cb2b011d37b97244c
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2022-03-01 08:15:01 +02:00
Toni Saario
28920cb7b4 Update conan profiles
Split the end user profile variants in two, e.g.:

linux-x86_64-gcc

->

  linux-x86_64-gcc  # 1
  baseprofiles/linux-x86_64-gcc  # 2

1) This is still the end user variant but this includes the
   counterpart from 3rdparty subfolder

2) This contains those settings and options that are needed
   for 3rd party depedencies like icu

Task-number: QTBUG-99213
Pick-to: 6.2 6.3
Change-Id: Ia6d7d9c5759848ff339cf8f50a40b10dfd9877d6
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-28 07:43:41 +00:00
Assam Boudjelthia
a4cc949b8d Rename the Android emulator to be more descriptive
Because we want to add Android 12 emulator for testing, it's important
to have a more descriptive emulator name. For this one, it includes
api_23 part.

Task-number: QTBUG-88846
Pick-to: 6.3 6.2
Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-23 19:22:22 +02:00
Toni Saario
ce51e1158a Add webos targets
Pick-to: 6.3
Task-number: QTQAINFRA-4518
Change-Id: Ib198a9ec02993be6eed92a2a6f9d80659fc9d5d7
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-22 08:16:48 +02:00
Heikki Halmet
1cc99e61dd Remove protobuf scripts for Windows
Script is currently failing in windows and no one has noticed this.
So apparently script is not needed by any module. If this will be needed
in the future then script needs to be fixed and merged back to
provisioning.

Pick-to: 6.3 6.2 5.15
Change-Id: Ia3deb3011b0cb6a9e145d0f126d4ab6723ce79f3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-22 08:16:46 +02:00
Toni Saario
a2393b5882 Update git
Older git version does not allow fetching single specific sha1.

Pick-to: 6.2 6.3
Change-Id: Ib795659a597042876a5c7b6fab3875fe1e39873d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-22 08:16:45 +02:00
Tony Sarajärvi
55f8095928 Update llvm-mingw to version 14.0.0 RC1
Task-number: QTQAINFRA-4805
Change-Id: Id83058d4b23494a4d29777c3a828c3585c61113c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-22 08:16:43 +02:00
Assam Boudjelthia
2fd91cfe5d Mark QtAA Android test as insignificant until proven to work
Make sure this doesn't block the repo, untill we have the whole
Android Automotive pipeline working.

Pick-to: 6.2 6.3
Change-Id: I1aaef98cb724c8e299b2adacce36d8e3f786b432
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2022-02-21 10:05:22 +02:00
Assam Boudjelthia
c36ce3dd49 Add Documentation tatget to tqtc-android-automoitve
Amends 69536e4b45.

Pick-to: 6.2 6.3
Fixes: QAA-1026
Change-Id: Ieed387fb20ec4ebf1a4fbd2633da9c9e98b0a60b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2022-02-21 08:05:02 +00:00
Heikki Halmet
73295cc05c Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Pick-to: 6.2
Pick-to: 6.3
Change-Id: I461a26cf258a3e5c62faf719612f643507662f72
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-19 09:03:53 +02:00
Heikki Halmet
1597f43512 Provisioning: Run msvc 2019 update at the beginning of provisioning
When script was run with prefix 99 the installation process wasn't
finished before machine got rebooted. Moving the script at
beginning of provisioning seems to help with the situation. This is
not a proper fix but the best we have right now.
We can change this later if/when we find the root cause for this.

Pick-to: 6.3 6.2 5.15
Task-number: QTQAINFRA-4813
Change-Id: Icbc2b0b33905990df611bdb494ed9b22801633fd
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-19 09:03:51 +02:00
Tony Sarajärvi
82ecf74768 Update llvm-mingw to version 13.0.0
When Windows 10 and 11 were updated, this was missing

Task-number: QTQAINFRA-4593
Change-Id: I52c920a5fc791db2039469f2931fa6c941f67e1e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-02-19 09:03:48 +02:00
Heikki Halmet
6c0950edf8 Provisioning: Install addtional Python 3.10.0 for Windows 10 21H2
Pick-to: 6.2
Pick-to: 6.3
Change-Id: Ic65b3b5b8dcea2ed918b005dbc8d4ea75daba61f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-19 09:03:46 +02:00
Johanna Äijälä
b3cd29e56f Provisioning: Squish 6.7.2
Update Squish packages to 6.7.2.

Pick-to: 6.3
Pick-to: 6.2
Change-Id: Id16b6337ff779eb21e1bd421ac46c57ad183dde2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-19 09:03:44 +02:00
Oliver Wolff
a91868e2c1 Update MSVC installer bootstrapper before updating MSVC itself
If there is an outdated MSVC installer bootstrapper an update to MSVC
might silently fail. Make sure that we update the bootstrapper before
calling the actual update.

NOTE! This change also upgrades MSVC 2019 version to 16.11.10

See https://developercommunity.visualstudio.com/t/setup-does-not-wait-for-installation-to-complete-w/26668
for some more information.

Pick-to: 6.2 6.3 5.15
Fixes: QTQAINFRA-4813
Change-Id: Ia595ceb5b373d1210670d3f357fb501bca1c8272
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-02-19 09:03:42 +02:00
Heikki Halmet
6cea45bfb8 Add passing targets as significant
There is still autotests failures in one Windows 11 target

Pick-to: 6.2
Pick-to: 6.3
Task-number: QTQAINFRA-4673
Change-Id: I2f7958a6da358069799db18143789c99bb3f4dac
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-18 07:23:08 +02:00
Volker Hilsheimer
2e4d6af574 Prune Linux configurations in CI
Remove the various FEATURE_xxx=off configurations, we don't support them
and if we break stuff, then those issues are easily fixed after the fact
and users relying on those combinations can provide patches. Most of them
are obsolete with Qt 6 anyway, as users can just not link against QtGui
or QtWidgets.

Also remove the -no-opengl configuration, with RHI it's mostly irrelevant
as there is very little Qt code outside of RHI that calls OpenGL APIs.

Combine the various other configurations into a single configuration
and remove subtle variations.

Pick-to: 6.3
Change-Id: Ia35713fc7373d54b82a11be14e2272ff011a51ab
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2022-02-17 05:59:29 +01:00
Dimitrios Apostolou
fba918784f Cleanup of QNX Coin platform config
Move TESTRUNNER setting to the coin platform config files in qtbase,
where it's configured for other platforms too.

Remove custom COIN_CTEST_RESULTSDIR. The build should put its
testresults logfiles where Coin expects them, and that is already set
correctly in platform configs found in qtbase.

Save the special environment that QNX needs to the env var QNX_TEST_ENV,
instead of the generic TESTARGS which might be overridden for other
purposes. QNX_TEST_ENV is now used by the script coin_qnx_qemu_runner.sh
defined in qtbase.

Change-Id: I86cd017c045f9c83f7c126828c8b6319df9b9d86
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-02-13 23:43:15 +01:00
Qt Submodule Update Bot
d11f7803f4 Update submodules on 'dev in qt/qt5'
Change-Id: Ic478dcb616b26d7b1a15662696331a33392f0a0c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-12 11:45:21 +00:00
Ievgenii Meshcheriakov
1044c10cab CI: Add platform config for qthttpserver module
The module is currently a qt extensions.

Task-number: QTBUG-100660
Change-Id: I33f223f4ac1d1ce0ed1d012e878be98168e97a31
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-02-11 12:04:59 +01:00
Topi Reinio
69b329a55f coin: Update provisioned qdoc, qtattributionsscanner binaries
Latest qdoc introduced a new command (\qmlvaluetype) used in
qtdeclarative documentation, as well as other fixes and
improvements.

Pick-to: 6.3
Change-Id: I6453468fb36dbe38d62f5eb9de74beffd568673b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2022-02-10 23:59:49 +01:00
Qt Submodule Update Bot
790989721d Update submodules on 'dev in qt/qt5'
Change-Id: I56ad311c1ad351514d0991a675f2fc451385ce0c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-10 22:59:48 +00:00
Assam Boudjelthia
69536e4b45 Update tqtc-android-automotive targets and add test target
The module is android specific and thus tests need to be disabled
for platforms other than Android Automotive.

Pick-to: 6.3 6.2
Change-Id: If7528bc0845c6266d77f94e8e6c7d0ba67075d1a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-10 14:56:05 +00:00
Joerg Bornemann
ce9f7751e3 CMake: Don't ignore repos without dependencies.yaml
While resolving inter-repository dependencies, we skipped dependencies
if their dependencies.yaml did not exist.  This is wrong.  Instead, such
repos must be handled as if they don't have dependencies.

Drive-by change: Clarify the dependencies result value in the comment
for qt_internal_resolve_module_dependencies.

This amends commit 8a94d1e294.

Fixes: QTBUG-100549
Change-Id: I523ed74cfa96a4bab238f3a475f28c3ac55dd7b4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-02-10 13:43:11 +01:00
Heikki Halmet
8732165461 Provisioning: Update OpenSSL to version 1.1.1m
Pick-to: 6.3
Pick-to: 6.2
Pick-to: 5.15
Change-Id: I93702b9faac5abc9fc01a5725cf34a17a94f0bea
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-02-05 15:59:17 +02:00
Heikki Halmet
3f263aa742 Move bluetooth script under correct platform folder
Pick-to: 6.3
Pick-to: 6.2
Change-Id: If1c873bb3334639477e43f8d5d83d62338f6f4c0
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-02-05 15:59:15 +02:00
Heikki Halmet
ac2bdfb93a Remove old Windows 10 targets
Windows 10 21H2 is now significant for all targets

Pick-to: 6.3
Task-number: QTQAINFRA-4539
Change-Id: I9435c11f7df6b7c2c77a5af10ebc5e0da5717ccb
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-04 08:17:33 +02:00
Heikki Halmet
0e641142c1 Make Win 10 21H2 Environment variables to match with the old Win 10
Fix few differencies. E.g. Conan env variables are missing

Pick-to: 6.3
Change-Id: Id08c422b1df61c2acaf59cf2bcdb0cc55cdcb1e7
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-02-04 08:17:15 +02:00
Heikki Halmet
72997d7039 Upgrade Xcode and Command Line Tools version to 13.2
Xcode 13.2 works only in macOS 11.3/12.0 or newer

Task-number: QTQAINFRA-4607
Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ic2034a2091a041a6daa0f342e5820641488c068b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-02-03 21:13:09 +02:00
Heikki Halmet
1865d70ef8 Provisioning: Start using latest macOS 11 version 11.6
New tier 1 image's name format is qtci-macos-11-x86_64

Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ieb23b64a0981bdd282d2ae482dd5ccda3f7ecaed
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-02-03 21:13:07 +02:00
Heikki Halmet
88cde9e500 Set correct Emscripten environment variables
Needed environment variables are set during emsdk installation when
installation is done using emsdk.git. But those are not set
as permanently. To have correct values we need to get them from
install environment and set them permanently for build environment.

Pick-to: 6.3
Pick-to: 6.2
Change-Id: Ifb80aa4a93608b79faffc8c59002c89804f60570
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-02-03 21:12:55 +02:00
Alexandru Croitor
ec6e186d10 CMake: Pass QT_BUILD_EXAMPLES instead of BUILD_EXAMPLES
BUILD_EXAMPLES was the old way to disable building examples, which is
not used anymore. This should remove the warning about an unused
BUILD_EXAMPLES variable.

Pick-to: 6.2 6.3
Fixes: COIN-762
Change-Id: Icf88d617e564939bcff5047f83d029e93df16401
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2022-02-02 11:29:51 +01:00
Luca Di Sera
fc7251edfa Update _clang_format to avoid adding a space in list-initialization
The current style specification for clang-format will add a space
between an identifier and an initializer_list in list-initialization.

For example:

```
auto foo{bar};
```

Would be modified to:

```
auto foo {bar};
```

The Qt Style Guidelines (https://wiki.qt.io/Qt_Coding_Style) do not seem
to dictate anything about this case, while dictating about a general
use of scope-delimiting braces that, arguably, does not apply here.

Following a rationale that is similar to the one in Google's C++ Style
Guide (https://google.github.io/styleguide/cppguide.html#Braced_Initializer_List_Format),
"SpaceBeforeCpp11BracedList" is now set to false to avoid the addition
of the aforementioned space.

Change-Id: Ic499994a24293a634858889352c717248b8d11e3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2022-02-01 12:12:42 +00:00
Heikki Halmet
279841383d Make Windows 10 21H2 significant
Task-number: QTQAINFRA-4600
Pick-to: 6.3
Change-Id: I0ffe3f94bfef9c15a1cbc98cd0afed8bf33c68c1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-01-31 20:22:26 +02:00
Heikki Halmet
10897d6514 Change Windows 11 targets Insignificant flag to cover only autotests
Pick-to: 6.3
Task-number: QTQAINFRA-4673
Change-Id: Ia841fec1fe4adcedf0af2ddfeeb9a19fd915baf7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-01-31 20:22:24 +02:00
Alexandru Croitor
93afb606b4 CMake: Fix linux static tests config to actually run
In 3c38cc22ce the dash was accidentally
removed and Coin was happy with it.

Reintroduce the dash.

Pick-to: 6.2 6.3
Change-Id: Idc5d3833191b0390e2d0aa480681a5350d289037
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-01-31 17:48:31 +01:00
Joerg Bornemann
8a94d1e294 CMake: Rework inter-repository dependency resolution
In certain cases the dependency resolution between Qt repositories
resulted in a wrong order, for example qtsvg being handled before
qtbase.  See the linked task for an example.

Replace the existing algorithm with a post-order traversal of the
dependency graph to produce a topological ordering.

Rename qt_internal_add_module_dependencies to
qt_internal_resolve_module_dependencies and remove unnecessary
positional arguments.  Use keyword arguments for a nicer API.

Raise the cmake_policy in QtSynchronizeRepo.cmake to avoid policy
warnings we now would get due to the use of IN_LIST.

Fixes: QTBUG-98268
Change-Id: I1425fd9c802fa71ae42549ceb14bcfc4c0a62078
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-01-31 11:10:40 +01:00
Pasi Petäjäjärvi
4a5550cc03 CI: Increase size of QNX qemu image for data partition
Some of the autotest require more free space to pass

Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: Iff4a4493e75d2770d691b936547143518a80e315
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 11:34:01 +00:00
Pasi Petäjäjärvi
848a7d5fa3 CI: Add font support for QNX qemu
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 13:33:55 +02:00
Pasi Petäjäjärvi
7486226c7a CI: Enable developer build for QNX x86_64
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: I119f47ba0ee36a19a6daca05383c90304b34e97a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 11:33:48 +00:00
Pasi Petäjäjärvi
2592bbe8c4 CI: Update libraries because of new QNX toolchain
QNX toolchain provides newer libfreetype which depends on new libbz2
library (qnx710-20211207-linux.tar.xz).

Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: I4bcb0b536ace594dd95faeed8e5a8d99e53afadd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 13:33:34 +02:00
Fabian Kosmale
2d3ac423b4 Enable C++20 standard for Ubuntu developer builds
Gives more CI coverage against build failures.

Task-number: QTQAINFRA-4117
Task-number: QTQAINFRA-4242
Change-Id: Ib40007cc5f6b0295d165c4f64aa3bde135050b7a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-01-29 09:01:21 +01:00
Jukka Jokiniva
0c26ca7077 Add yaml file for Android Automotive
Change-Id: I1007453ba47e7a7be4fe60ef065695189eb44f98
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 06b5cd95e6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-28 08:06:03 +00:00
Jani Heikkinen
56dd3e2127 Add qtlanguageserver as a optional dependency for qtdeclarative
Fixes: QTBUG-99737
Change-Id: I9dd71496b6ea974003158ffdd3e651beed60c31d
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 2d329b06e1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-28 05:37:06 +00:00
Qt Submodule Update Bot
a1c576d6be Update submodules on 'dev in qt/qt5'
Change-Id: Icda71fd8609c2d6449c3d8eaa541c268f2622724
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-28 05:37:05 +00:00
Heikki Halmet
1e8939b4b2 Provisioning: Change installation order between libicu and gtk3
Gtk3-devel includes dependency which conflicts with libicu-devel.
Changing installation order should solve it

Pick-to: 6.3
Pick-to: 6.2
Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-01-11 13:47:26 +00:00
Toni Saario
81dcae4f93 Provision conan on arm macOS
Pick-to: 6.2 6.3
Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-01-07 16:46:29 +02:00
Heikki Halmet
854e478223 Remove Insignificant flags from Creator, flashing-wizard and saferenderer
Pick-to: 6.3
Pick-to: 6.2
Change-Id: If4941f00f51281df4f2f233bd89bfaf0d0ed5a0d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-01-04 15:22:37 +02:00
Heikki Halmet
ebb9836451 Add OPENSSL_ROOT_DIR for macOS Android targets
Enabling OpenSSL requires OPENSSL_ROOT_DIR environment variable.

Pick-to: 6.3
Pick-to: 6.2
Task-number: QTBUG-97243
Change-Id: I055c236d0f346ddc2e2aff873f2bd98cacfb5ec3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-01-04 07:51:16 +02:00
Heikki Halmet
000691d833 Make macOS 12 on ARM developer build tests significant
Pick-to: 6.3
Pick-to: 6.2
Task-number: QTQAINFRA-4649
Change-Id: Ia12310a3439058f706d55242ece5ee185073f7ce
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-01-03 12:57:54 +02:00
Heikki Halmet
d4cb44ad71 Replace .ci.local suffix with .ci.qt.io
Plan is to terminate .ci.local soon

Pick-to: 6.3
Pick-to: 6.2
Pick-to: 5.15
Change-Id: I8198ea744eeb91974569d47b2147f08b18f97f73
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-23 10:00:47 +02:00
Tor Arne Vestbø
b19b02173c coin: Move all builds over to macOS 12
Pick-to: 6.2
Change-Id: Ief01ca81cda49d518e910e01f70f78a5c8430ed7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2021-12-23 01:43:05 +01:00
Tor Arne Vestbø
ccf24d5f2a coin: Make macOS 12 on ARM packaging tests significant
Pick-to: 6.2 6.3
Change-Id: I6e89626e52f21d19e8665769b4d8f6ee9a54e537
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-21 11:02:35 +00:00
Tor Arne Vestbø
649592deea Bump qtconnectivity
Change-Id: I8b9ea944ed95d70a41fb7abcef199b77cb15d353
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2021-12-20 13:57:03 +01:00
Toni Saario
099f184880 Add qt-conan-common platforms
Pick-to: 6.2 6.3
Change-Id: I99c9b148d4a3b23acc8c4bbd36cd1ea9ad32eac9
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2021-12-20 07:39:22 +00:00
Kai Köhne
becb423e80 Replace LGPL2.1 only header with LGPL3 one
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Pick-to: 6.3
Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-19 19:47:15 +00:00
Ville-Pekka Karhu
fe35c4dbb0 macOS: Upgrade Xcode to 13.2
Task-number: QTQAINFRA-4607
Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ice52c8f4199e124d92b994cab38151dd712986bf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-19 14:39:54 +02:00
Ville-Pekka Karhu
20c580e5db macOS provisioning: Disable bluetooth
Pick-to: 6.2
Pick-to: 6.3
Change-Id: Ia981b4ab37a6ca15a566feb2fdc176253b419193
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-19 14:39:48 +02:00
Heikki Halmet
ccf269f5da Remove InsignificantTests flag from Windows 10 targets
Change-Id: Ib6ec59762f1188d1dc2a133fdf44628d47fd1b57
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-18 09:05:10 +02:00
Jani Heikkinen
b9a59fe113 Update latest qt license agreement
Pick-to: 6.2 6.3
Change-Id: Iee3b30b298bac748133daf3f0e58f8dab195a2fe
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2021-12-17 10:44:46 +00:00
Heikki Halmet
9d09f9cee9 Upgrade MSVC 2019 and build tools versions to 16.11.8
Task-number: QTQAINFRA-4704
Pick-to: 6.3
Pick-to: 6.2
Pick-to: 5.15
Change-Id: I77e83f392869e81b20cdc11e970f24448bb66420
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2021-12-17 09:40:41 +02:00
Pasi Petäjäjärvi
1cb9c1caef CI: Add image support for QNX qemu
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: If040af8d074e7e197449eb4be68507e83214d393
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-15 00:13:26 +00:00
Pasi Petäjäjärvi
10a443c181 CI: Add timezone support for QNX qemu
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: Ie27f53fbf68c656dfdd7ddba72ef1c991416faeb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-15 00:13:26 +00:00
Jani Heikkinen
f55b82ee1d Update qttools submodule
Change-Id: Ic538882d50ff40a94a7b05d8fbc10b52da61fdbf
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-12-14 14:53:27 +02:00
Heikki Halmet
71e7ed17a2 Provisioning: Install up-to-date google Chrome for Wasm auto tests
Task-number: QTBUG-99062
Pick-to: 6.2
Change-Id: Ib9ebcad5d9700c09d01d1ba23fed716d3a3cae4b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-14 09:37:27 +02:00
Heikki Halmet
5ce8c724d2 Remove duplicate MinGW environment variables
Pick-to: 6.3
Pick-to: 6.2
Change-Id: I2018b0c46b9708f699e5da6155e95151a49394fb
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-12-14 09:37:25 +02:00
Simo Fält
ef4fcb8ac7 Provisioning: Set Python 3.9 as a default on Arm macs
The default intepreter under Frameworks is not working properly for
all CI use cases.

Change-Id: If665ea9ad81afa510c00162021ba7b143855cbd7
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2021-12-13 11:38:55 +00:00
Pasi Petäjäjärvi
06edc60e1d CI: Add inotify support for QNX
Adds Filesystem event manager server to image and also add HOME env
varbiable for root user.

Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: I4df10f17f4e274dc0d21fea1a767c351ba3c8362
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-13 11:38:55 +00:00
Alexandru Croitor
6e7de2b76c Coin:Android: set ANDROID_SDK_ROOT explicitly in macOS 12 config
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Amends 7e2882d0a7

Augments d59825d250

Pick-to: 6.2 6.3
Task-number: QTBUG-97002
Change-Id: I96fb543521d70784d75e524d8b48ac72c42e6815
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-12-13 12:38:55 +01:00
Toni Saario
1a1028ea20 Add tqtc-qtdigitaladvertising platforms
Pick-to: 6.2 6.2.2
Change-Id: I839e0c2509dfac800a06d9c791b693dbc8681a52
Reviewed-by: Mateusz Ligocki <mateusz.ligocki@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-13 13:38:55 +02:00
Heikki Halmet
b730181404 Remove Rhel 8.2 targets
Rhel 8.4 is already in use

Task-number: QTQAINFRA-4515
Change-Id: I32bba97143adb5243e5ba500eceaad9723a7209e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-13 09:16:43 +02:00
309 changed files with 3794 additions and 1029 deletions

100
.gitmodules vendored
View File

@@ -1,53 +1,53 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 6.3.2
branch = 6.4.2
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
path = qtdeclarative
url = ../qtdeclarative.git
branch = 6.3.2
branch = 6.4.2
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtmultimedia"]
depends = qtbase qtshadertools
recommends = qtdeclarative
recommends = qtdeclarative qtquick3d
path = qtmultimedia
url = ../qtmultimedia.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 6.3.2
branch = 6.4.2
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 6.3
branch = dev
status = ignore
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 6.3.2
branch = 6.4.2
status = essential
priority = 30
[submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia
path = qtdoc
url = ../qtdoc.git
branch = 6.3.2
branch = 6.4.2
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -76,21 +76,21 @@
recommends = qtdeclarative
path = qtlocation
url = ../qtlocation.git
branch = 6.3
branch = dev
status = ignore
[submodule "qtpositioning"]
depends = qtbase
recommends = qtdeclarative qtserialport
path = qtpositioning
url = ../qtpositioning.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -117,189 +117,203 @@
recommends = qtdeclarative
path = qtconnectivity
url = ../qtconnectivity.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtshadertools
path = qt3d
url = ../qt3d.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtwebchannel qttools qtpositioning
path = qtwebengine
url = ../qtwebengine.git
branch = 6.3.2
branch = 6.4.2
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 6.3
branch = dev
status = ignore
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 6.3
branch = dev
status = ignore
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 6.3.2
status = ignore
branch = 6.4.2
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 6.3
branch = dev
status = ignore
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
recommends = qtquicktimeline
path = qtquick3d
url = ../qtquick3d.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools
url = ../qtshadertools.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qt5compat"]
depends = qtbase qtdeclarative
path = qt5compat
url = ../qt5compat.git
branch = 6.3.2
branch = 6.4.2
status = deprecated
[submodule "qtcoap"]
depends = qtbase
path = qtcoap
url = ../qtcoap.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtmqtt"]
depends = qtbase qtdeclarative
path = qtmqtt
url = ../qtmqtt.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtopcua"]
depends = qtbase qtdeclarative
path = qtopcua
url = ../qtopcua.git
branch = 6.3.2
branch = 6.4.2
status = addon
[submodule "qtlanguageserver"]
depends = qtbase
path = qtlanguageserver
url = ../qtlanguageserver.git
branch = 6.3.2
branch = 6.4.2
status = preview
[submodule "qthttpserver"]
depends = qtbase
recommends = qtwebsockets
path = qthttpserver
url = ../qthttpserver.git
branch = 6.4.2
status = preview
[submodule "qtquick3dphysics"]
depends = qtbase qtdeclarative qtquick3d qtshadertools
path = qtquick3dphysics
url = ../qtquick3dphysics.git
branch = 6.4.2
status = preview

View File

@@ -20,9 +20,10 @@ ColumnLimit: 100
# How much weight do extra characters after the line length limit have.
# PenaltyExcessCharacter: 4
# Disable reflow of qdoc comments: indentation rules are different.
# Translation comments are also excluded.
CommentPragmas: "^!|^:"
# Disable reflow of some specific comments
# qdoc comments: indentation rules are different.
# Translation comments and SPDX license identifiers are also excluded.
CommentPragmas: "^!|^:|^ SPDX-License-Identifier:"
# We want a space between the type and the star for pointer types.
PointerBindsToType: false
@@ -83,3 +84,8 @@ ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCH
# Break constructor initializers before the colon and after the commas.
BreakConstructorInitializers: BeforeColon
# Avoids the addition of a space between an identifier and the
# initializer list in list-initialization.
SpaceBeforeCpp11BracedList: false

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,17 +0,0 @@
[settings]
os=Linux
arch=x86_64
compiler=gcc
compiler.version=9.3
compiler.libcxx=libstdc++11
build_type=Release
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:nomake=tests;examples
qtbase:developer_build=yes
qtbase:cmake_args_qtbase=""
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,16 +1,9 @@
[settings]
os=Emscripten
arch=wasm
compiler=clang
compiler.version=10
compiler.libcxx=libstdc++
build_type=RelWithDebInfo
include(baseprofiles/linux-webassembly-x86_64-clang)
[options]
qtbase:release=yes
qtbase:shared=no
qtbase:release=True
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:nomake=examples;tests
qtbase:force_debug_info=yes
qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
*:cmake_args_leaf_module=""
[build_requires]

View File

@@ -1,22 +1,17 @@
[settings]
os=Linux
arch=x86_64
compiler=gcc
compiler.version=9.3
compiler.libcxx=libstdc++11
build_type=RelWithDebInfo
include(baseprofiles/linux-x86_64-gcc)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:release=True
qtbase:nomake=tests;examples
qtbase:separate_debug_info=yes
qtbase:force_debug_info=yes
qtbase:bundled_xcb_xinput=yes
qtbase:libudev=no
qtbase:separate_debug_info=True
qtbase:force_debug_info=True
qtbase:bundled_xcb_xinput=True
qtbase:libudev=False
qtbase:doubleconversion=qt
qtbase:pcre=qt
qtbase:libjpeg=qt
qtbase:libpng=qt
qtbase:icu=True
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF"
*:cmake_args_leaf_module=""
[build_requires]

View File

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

View File

@@ -1,17 +1,11 @@
[settings]
os=iOS
os.version=13.0
arch=armv8
compiler=apple-clang
compiler.version=11.0
compiler.libcxx=libc++
build_type=Release
include(baseprofiles/macos-ios-arm64-clang)
[options]
qtbase:shared=no
qtbase:debug_and_release=yes
qtbase:debug_and_release=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_SYSTEM_NAME=iOS"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -1,18 +1,11 @@
[settings]
os=Macos
os.version=11.0
arch=x86_64
compiler=apple-clang
compiler.version=12.0
compiler.libcxx=libc++
build_type=RelWithDebInfo
include(baseprofiles/macos-universal-clang)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:release=True
qtbase:nomake=examples;tests
qtbase:force_debug_info=yes
qtbase:separate_debug_info=yes
qtbase:framework=yes
qtbase:force_debug_info=True
qtbase:separate_debug_info=True
qtbase:framework=True
qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DODBC_ROOT=/usr/local/opt/libiodbc'
*:cmake_args_leaf_module=""
[build_requires]

View File

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

View File

@@ -1,15 +1,8 @@
[settings]
os=Android
os.api_level=8
arch=armv8
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
include(baseprofiles/unix-android-arm64-clang)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:force_debug_info=yes
qtbase:release=True
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang

View File

@@ -1,15 +1,8 @@
[settings]
os=Android
os.api_level=8
arch=armv7
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
include(baseprofiles/unix-android-armv7-clang)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:force_debug_info=yes
qtbase:release=True
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang

View File

@@ -1,15 +1,8 @@
[settings]
os=Android
os.api_level=8
arch=x86
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
include(baseprofiles/unix-android-x86-clang)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:force_debug_info=yes
qtbase:release=True
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang

View File

@@ -1,15 +1,8 @@
[settings]
os=Android
os.api_level=8
arch=x86_64
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
include(baseprofiles/unix-android-x86_64-clang)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:force_debug_info=yes
qtbase:release=True
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang

View File

@@ -1,16 +1,9 @@
[settings]
os=Android
os.api_level=8
arch=armv8
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
include(baseprofiles/windows-android-arm64-clang)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:pkg_config=no
qtbase:force_debug_info=yes
qtbase:release=True
qtbase:pkg_config=False
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang

View File

@@ -1,16 +1,9 @@
[settings]
os=Android
os.api_level=8
arch=armv7
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
include(baseprofiles/windows-android-armv7-clang)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:pkg_config=no
qtbase:force_debug_info=yes
qtbase:release=True
qtbase:pkg_config=False
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang

View File

@@ -1,16 +1,9 @@
[settings]
os=Android
os.api_level=8
arch=x86
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
include(baseprofiles/windows-android-x86-clang)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:pkg_config=no
qtbase:force_debug_info=yes
qtbase:release=True
qtbase:pkg_config=False
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang

View File

@@ -1,16 +1,9 @@
[settings]
os=Android
os.api_level=8
arch=x86_64
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
include(baseprofiles/windows-android-x86_64-clang)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:pkg_config=no
qtbase:force_debug_info=yes
qtbase:release=True
qtbase:pkg_config=False
qtbase:force_debug_info=True
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang

View File

@@ -1,15 +1,7 @@
[settings]
os=Windows
arch=armv8
compiler=msvc
compiler.version=19.28
compiler.cppstd=17
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release
include(baseprofiles/windows-arm64-msvc2019_64)
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:release=True
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:nomake=tests
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DFEATURE_msvc_obj_debug_info=ON"

View File

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

View File

@@ -1,15 +1,9 @@
[settings]
os=Windows
arch=x86_64
compiler=gcc
compiler.version=8.1
compiler.libcxx=libstdc++
build_type=RelWithDebInfo
include(baseprofiles/windows-x86_64-mingw)
[options]
qtbase:shared=yes
qtbase:debug_and_release=yes
qtbase:force_debug_info=yes
qtbase:separate_debug_info=yes
qtbase:release=True
qtbase:force_debug_info=True
qtbase:separate_debug_info=True
qtbase:nomake=examples;tests
qtbase:zlib=qt
qtbase:libjpeg=qt

View File

@@ -1,17 +1,9 @@
[settings]
os=Windows
arch=x86_64
compiler=msvc
compiler.version=19.28
compiler.cppstd=17
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=RelWithDebInfo
include(baseprofiles/windows-x86_64-msvc2019_64)
[options]
qtbase:shared=yes
qtbase:nomake=tests
qtbase:debug_and_release=yes
qtbase:force_debug_info=yes
qtbase:debug_and_release=True
qtbase:force_debug_info=True
qtbase:zlib=None
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON"
*:cmake_args_leaf_module=""

View File

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

View File

@@ -0,0 +1,32 @@
type: Group
instructions:
- type: EnvironmentVariable
variableName: QT_MODULE_TO_TEST
variableValue: "qt=QtConcurrent,QtCore,QtDBus,QtDesigner,QtGui,QtHelp,QtNetwork,QtOpenGL,QtPrintSupport,QtQml,QtQuick,QtQuickTest,QtSql,QtSvg,QtTest,QtWidgets,QtXml;{{.SourceDir}}/qtbase"
- type: EnvironmentVariable
variableName: QTDIR
variableValue: "{{.InstallDir}}"
- type: PrependToEnvironmentVariable
variableName: PATH
variableValue: "{{.InstallDir}}/bin:"
- type: ChangeDirectory
directory: "{{.SourceDir}}/qtqa/tests/postbuild/bic"
- type: ExecuteCommand
command: ["{{.InstallDir}}/bin/qmake"]
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 300
userMessageOnFailure: "Failed to execute qmake for bic tests"
- type: ExecuteCommand
command: ["make", "check", "-j1"]
maxTimeInSeconds: 7200
maxTimeBetweenOutput: 300
userMessageOnFailure: "Failed to execute bic tests"
enable_if:
condition: and
conditions:
- condition: property
property: features
contains_value: Packaging
- condition: property
property: target.os
equals_value: Linux

View File

@@ -9,6 +9,4 @@ instructions:
- !include "{{qt/qt5}}/coin_qt_build_template.yaml"
Test:
- type: EnvironmentVariable
variableName: Dummy
variableValue: dummy
- !include "{{qt/qt5}}/coin_bic_tests.yaml"

View File

@@ -2,9 +2,7 @@ Version: 2
Include: [
cmake_platforms_qemu.yaml,
cmake_platforms_qemu_qnx710.yaml,
cmake_platforms_target_android_host_linux.yaml,
cmake_platforms_target_android_host_macos.yaml,
cmake_platforms_target_android_host_windows.yaml,
cmake_platforms_target_android.yaml,
cmake_platforms_wasm.yaml,
macos.yaml
]
@@ -13,7 +11,8 @@ Configurations:
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
Configure arguments: '-make examples -developer-build -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
-
Id: 'Ubuntu-20.04-host'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -21,20 +20,21 @@ Configurations:
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
-
Id: 'OpenSUSE-15.3-host'
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
Id: 'OpenSUSE-15.4-host'
Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure']
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
]
-
Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests', 'UseConfigure']
Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -49,9 +49,9 @@ Configurations:
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64']
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
-
Template: 'qtci-windows-11_21H2-x86_64-51'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -65,25 +65,29 @@ Configurations:
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Template: 'qtci-windows-11_21H2-x86_64-51'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Id: 'Windows10_21H2-MSVC2019-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
@@ -94,44 +98,47 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64',
'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'
]
-
Id: 'Windows11_21H2-MSVC2019-x64-host'
Template: 'qtci-windows-11_21H2-x86_64-51'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
]
-
Template: 'qtci-windows-11_21H2-x86_64-51'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
Platform dependency: 'Windows11_21H2-MSVC2019-x64-host'
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON'
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64'
]
-
Id: 'RHEL-8.4-host'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'UseConfigure']
Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc'
]
-
Id: 'ios-universal'
Template: 'qtci-macos-12-x86_64-102'
Template: 'qtci-macos-12-x86_64-105'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
@@ -140,8 +147,8 @@ Configurations:
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang'
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
]
-
Id: 'Windows10_21H2-Mingw11-x64-host'
@@ -154,7 +161,7 @@ Configurations:
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw'
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'
]
-
Id: 'Windows10_21H2-LLVM-x64-host'
@@ -165,40 +172,40 @@ Configurations:
Environment variables: [
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
'LLVM_INSTALL_DIR=C:\llvm-mingw'
]
-
Id: 'Windows11_21H2-LLVM-x64-host'
Template: 'qtci-windows-11_21H2-x86_64-51'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'Clang'
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
'LLVM_INSTALL_DIR=C:\llvm-mingw'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
Features: ['Sccache', 'UseConfigure']
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
]
-
Template: 'qtci-windows-11_21H2-x86_64-51'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'Mingw'
Features: ['Sccache', 'UseConfigure']
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
]

View File

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

View File

@@ -8,14 +8,12 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['Packaging', 'InsignificantTests', 'VMSize8', 'UseConfigure']
Features: ['Packaging', 'VMSize8', 'UseConfigure']
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',
'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin',
"TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci'",
"TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'",
"COIN_CTEST_RESULTSDIR=/home/qt/work"
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'QT_CMAKE_DIR=/opt/cmake-3.24.2/bin',
'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
]
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -27,7 +25,7 @@ Configurations:
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
]
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -39,5 +37,5 @@ Configurations:
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
]

View File

@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: 'sles-15-static'
Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -19,7 +19,7 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Template: 'qtci-macos-11-x86_64-104'
Template: 'qtci-macos-11-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'

View File

@@ -0,0 +1,65 @@
Version: 2
Configurations:
-
Id: 'android-arm64-on-macos'
Template: 'qtci-macos-12-x86_64-105'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
'ANDROID_EMULATOR=@emulator_x86_api_23',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis 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',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]

View File

@@ -1,59 +0,0 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang'
]
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
]
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
'ANDROID_EMULATOR=@emulator_x86_api_23'
]
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang'
]

View File

@@ -1,59 +0,0 @@
Version: 2
Configurations:
-
Id: 'android-arm64-on-macos'
Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang'
]
-
Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
]
-
Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang'
]
-
Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang'
]

View File

@@ -1,62 +0,0 @@
Version: 2
Configurations:
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a -no-feature-pkg-config',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86 -no-feature-pkg-config',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64 -no-feature-pkg-config',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang'
]

View File

@@ -1,38 +1,26 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'OpenSUSE-15.3-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'WebAssembly'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF'
]
-
Template: 'qtci-macos-12-x86_64-102'
Target os: 'WebAssembly'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Platform dependency: 'OpenSUSE-15.4-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc'
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang'
]
-
Id: 'webassembly-thread-asyncify'
Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'OpenSUSE-15.4-host'
Features: ['Sccache', 'DisableTests']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_thread=ON -DQT_QMAKE_DEVICE_OPTIONS="QT_EMSCRIPTEN_ASYNCIFY=1"',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

View File

@@ -10,7 +10,7 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',

View File

@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: "ios-tests-target"
Template: 'qtci-macos-12-x86_64-102'
Template: 'qtci-macos-12-x86_64-105'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'

View File

@@ -7,9 +7,10 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'AndroidTestRun']
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_INSTALL_DIR={{.InstallDir}}/target',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',

View File

@@ -9,15 +9,26 @@ Configurations:
-
Id: 'macos-latest-xcode-universal-packaging-build'
Template: 'qtci-macos-12-x86_64-102'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF',
'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
]
-
Id: 'macos-latest-xcode-arm64-universal-build'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
]
# Test on all supported macOS versions (deployment targets)
@@ -36,7 +47,7 @@ Configurations:
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-11-x86_64-tests'
Template: 'qtci-macos-11-x86_64-104'
Template: 'qtci-macos-11-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
@@ -53,11 +64,29 @@ Configurations:
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-12-x86_64-tests'
Template: 'qtci-macos-12-x86_64-102'
Id: 'macos-13-arm64-tests'
Template: 'qtci-macos-13-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-12-x86_64-tests'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-12-arm64-arm64-universal-build-tests'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-arm64-universal-build'
-
Id: 'macos-12-x86_64-arm64-universal-build-tests'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-arm64-universal-build'
# =========================================================================
# Developer build. Single architecture builds.
@@ -67,12 +96,13 @@ Configurations:
-
Id: 'macos-latest-xcode-x86_64-developer-build'
Template: 'qtci-macos-12-x86_64-102'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
-
Id: 'macos-latest-xcode-arm64-developer-build'
@@ -99,7 +129,7 @@ Configurations:
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
-
Id: 'macos-11-x86_64-developer-build-tests'
Template: 'qtci-macos-11-x86_64-104'
Template: 'qtci-macos-11-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
@@ -111,7 +141,7 @@ Configurations:
Platform dependency: 'macos-latest-xcode-arm64-developer-build'
-
Id: 'macos-12-x86_64-developer-build-tests'
Template: 'qtci-macos-12-x86_64-102'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
@@ -121,3 +151,9 @@ Configurations:
Compiler: 'Clang'
Features: ['TestOnly']
Platform dependency: 'macos-latest-xcode-arm64-developer-build'
-
Id: 'macos-13-arm64-developer-build-tests'
Template: 'qtci-macos-13-arm64'
Compiler: 'Clang'
Features: ['TestOnly']
Platform dependency: 'macos-latest-xcode-arm64-developer-build'

View File

@@ -0,0 +1,20 @@
Version: 2
Include: [
cmake_platforms.yaml: [
Windows10_21H2-MSVC2019-x64-host
]
]
Configurations:
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'QNX_710'
Target arch: 'arm64'
Compiler: 'MSVC2019'
Target compiler: 'QCC'
Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
Features: ['DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_LIBRARY_PATH={{.Env.QNX_710}}\target\qnx7\aarch64le\lib;{{.Env.QNX_710}}\target\qnx7\aarch64le\usr\lib -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON'
]

View File

@@ -9,7 +9,7 @@ Include: [
macos.yaml: [
"macos-12-x86_64-tests",
],
cmake_platforms_target_android_host_macos.yaml: [
cmake_platforms_target_android.yaml: [
"android-arm64-on-macos"
],
cmake_platforms_qemu.yaml: [

View File

@@ -0,0 +1,15 @@
Version: 2
Module only: True
Configurations:
-
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['DisableTests']
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['DisableTests']
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

View File

@@ -2,7 +2,6 @@ Version: 2
Include: [
cmake_platforms.yaml,
integrity.yaml,
cmake_platforms_static_tests.yaml,
linux_android_tests_developer.yaml
cmake_platforms_static_tests.yaml
]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -4,21 +4,21 @@ Configurations:
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
Features: ['UseLegacyInstructions']
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'

View File

@@ -1,15 +1,11 @@
Version: 2
Include: [
cmake_platforms_target_android_host_linux.yaml,
cmake_platforms_target_android_host_macos.yaml,
cmake_platforms_target_android_host_windows.yaml
]
Include: [ cmake_platforms_target_android.yaml ]
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
Configure arguments: '-make examples -developer-build -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
-
Id: 'Windows10_21H2-Mingw11-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
@@ -24,7 +20,7 @@ Configurations:
]
-
Id: 'macos-latest-xcode-universal-packaging-build'
Template: 'qtci-macos-12-x86_64-102'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -53,8 +49,8 @@ Configurations:
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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}}',
'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}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,64 @@
### SUSE Linux Enterprise Server 15 SP4 ###
# Installation #
Language: English (US)
Keyboard Layout: English (US)
Available Extensions and Modules:
Basesystem Module
Desktop Applications Module
Python 3 Module
Server Applications Module
SLES with GNOME
Region: Etc
Time Zone: UTC
Create user with automatic login
disable firewall
Displays: Resolution 1280x800
Power: Screen Blank: Never
Privacy: Screen lock: Automatic screen lock: disable
Privacy: Screen lock: Show notifications on lock screen: disable
# Add user to sudoers
Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
sudo su -
echo "add_drivers+=\"virtio-blk\"" >/etc/dracut.conf.d/virtio.conf
dracut -f
# Add these to /etc/polkit-default-privs.local
org.freedesktop.udisks2.filesystem-mount yes
org.freedesktop.udisks2.filesystem-mount-other-seat yes
org.freedesktop.udisks2.filesystem-mount-system yes
org.freedesktop.login1.power-off yes
org.freedesktop.login1.power-off-ignore-inhibit yes
org.freedesktop.login1.power-off-multiple-sessions yes
# Set how DHClient creates CID for compatibility with older DHCP servers
sudo sed -i 's/DHCLIENT_CREATE_CID=""/DHCLIENT_CREATE_CID="rfc2132"/' /etc/sysconfig/network/dhcp
systemctl restart wicked
# Create etc/sysconfig/network/ifcfg-eth1 with values:
* BOOTPROTO='dhcp'
* STARTMODE='auto'
sudo ifup eth1
# Register product
# Add 'Available Extensions and Modules'
* Basesystem Module 15 SP4 x86_64
* Server Applications Module 15 SP4 x86_64
zypper yum update
* Download and run coin-setup
# Fetch and run coin-setup
Download http://coin/coin/binary/linux_386/coin-setup
sudo ./coin-setup
sudo reboot now

View File

@@ -0,0 +1,42 @@
### OpenSUSE Leap 15.4 ###
## KDE ##
## In qtci-linux-openSUSE-15.4-x86_64-50 > Graphics Platform: X11 (System default) ##
## In qtci-linux-openSUSE-15.4-x86_64-51 > Graphics Platform: Wayland (Plasma (Wayland))##
# Installation #
Language: English (US)
Keyboard Layout: English (US)
Activate online repositories during installation (yes)
Use default selections
Desktop with KDE Plasma
Suggested Partitioning - default values
Time Zone: UTC
## Configurations ##
Download and run coin-setup binary
YaST - System - Services Manager - Firewalld - Stop
# enable ssh access
sudo rcsshd start
Workspace Behavior - Screen locking - Lock screen automatically - unselect options
Startup and Shutdown - Behavior - Login Screen - Select Automatically log in with session (System default)
Add below to '$HOME/.config/autostart/coin-bootstrap-agent.desktop'
[Desktop Entry]
Type=Application
Exec=/usr/bin/gnome-terminal -e "/home/qt/bootstrap-agent /dev/ttyS0"
Hidden=false
X-GNOME-Autostart-enabled=true
Name=Coin
Notifications
Critical notifications - unselect
Log priority notifications - unselect
Application progress: Show in task manager - unselect
Show in notifications - unselect
Notification badges: Show in task manager - unselect
Display and Monitor - Display Configuration - 1280x800
Power Management: Screen Energy Saving - unselect
add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt

View File

@@ -27,3 +27,12 @@
- Copy its content to Tier1 folder
* Copy Tier1 folder to 101 NFS
- Check folder access rights
# How to upgrade existing Tier1 image
* Open KVM connection to Intel mac Parallels host
- Open Parallels :: create new VM :: select macOS :: start installation but then stop it when machine boots to recovery mode
* You should now have a virtual machine folder in /Users/qt/Parallels/<VM folder>
* Remove files from <VM folder>/harddisk.hdd/ and copy Tier1 VM files from NFS to <VM folder>/harddisk.hdd/
* Start the virtual machine and make needed changes
* Copy <VM folder>/harddisk.hdd to NFS with updated number in its name

View File

@@ -55,18 +55,20 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/android"
sdkTargetFolder="$targetFolder/sdk"
sudo mkdir -p $sdkTargetFolder
basePath="http://ci-files01-hki.intra.qt.io/input/android"
toolsVersion="2.1"
toolsFile="commandlinetools-linux-6609375_latest.zip"
ndkVersion="r22b"
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
ndkVersionLatest="r23b"
ndkVersionDefault=$ndkVersionLatest
sdkBuildToolsVersion="31.0.0"
sdkApiLevel="android-31"
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
ndkSha1Latest="f47ec4c4badd11e9f593a8450180884a927c330d"
ndkSha1Default=$ndkSha1Latest
# Android automotive
sdkApiLevelAutomovie="android-30"
androidAutomotive11Url="$basePath/${sdkApiLevelAutomovie}_automotive.tar.gz"
@@ -75,18 +77,37 @@ android11Sha="4a5cd2bea7ce323b724c3ff1faab13d99f9d2be9"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
ndkTargetFile="/tmp/$ndkFile"
ndkSourceFile="$basePath/$ndkFile"
echo "Download and unzip Android SDK"
DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
echo "Unzipping Android NDK to '$targetFolder'"
sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
echo "Unzipping Android Tools to '$sdkTargetFolder'"
sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
rm "$ndkTargetFile"
rm "$toolsTargetFile"
function InstallNdk() {
ndkVersion=$1
ndkSha1=$2
if [[ ! -d $targetFolder/android-ndk-$ndkVersion ]]; then
ndkFile="android-ndk-$ndkVersion-linux.zip"
ndkTargetFile="/tmp/$ndkFile"
ndkSourceFile="$basePath/$ndkFile"
DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
echo "Unzipping Android NDK to '$targetFolder'"
sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
rm "$ndkTargetFile"
fi
}
InstallNdk $ndkVersionDefault $ndkSha1Default
SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$targetFolder/android-ndk-$ndkVersionDefault"
InstallNdk $ndkVersionLatest $ndkSha1Latest
SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
echo "Changing ownership of Android files."
if uname -a |grep -q "el7"; then
sudo chown -R qt:wheel "$targetFolder"
@@ -122,7 +143,6 @@ echo "Checking the contents of Android SDK..."
ls -l "$sdkTargetFolder"
SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"

View File

@@ -0,0 +1,126 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 3 as published by the Free Software
## Foundation and appearing in the file LICENSE.LGPL3 included in the
## packaging of this file. Please review the following information to
## ensure the GNU Lesser General Public License version 3 requirements
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 2.0 or (at your option) the GNU General
## Public license version 3 or any later version approved by the KDE Free
## Qt Foundation. The licenses are as published by the Free Software
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
## https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
#############################################################################
set -ex
# Make bootstap agent run in background without terminal view
# Terminal view can cause issues with Autotests
# Create shell wrapper to pass environment variables
wrapper="${HOME}/bootstrap-agent.sh"
autostart_folder="${HOME}/.config/autostart"
# This directory should exist. Created in base image (tier 1)
mkdir -p ${autostart_folder}
# Create autostart desktop file and shell wrapper
sudo tee ${autostart_folder}/coin-bootstrap-agent.desktop <<"EOF"
[Desktop Entry]
Type=Application
Exec=/home/qt/bootstrap-agent.sh
Hidden=false
X-GNOME-Autostart-enabled=true
Name=Coin
EOF
sudo tee $wrapper <<"EOF"
#!/bin/sh
# Wait for network to come up
x=0
while ! cat "/etc/resolv.conf" | grep -v "#" | grep "nameserver" > /dev/null ; do
echo "(WW) wating for network ($x/20)..." >> /home/qt/bootstrap-agent.txt
x=$((x+1))
sleep 1
if [ "$x" -gt 20 ]; then
echo "(EE) netowrk down. Exiting bootstrap." >> /home/qt/bootstrap-agent.txt
exit 1
fi
done
echo "(**) network found." >> /home/qt/bootstrap-agent.txt
# Wait for context to be mounted
x=0
while ! ([ -f "/media/qt/CONTEXT/context.sh" ] || [ -f "/media/CONTEXT/context.sh" ] || [ -f "/run/media/qt/CONTEXT/context.sh" ]); do
echo "(WW) waiting for context file to be mounted ($x/20)..." >> /home/qt/bootstrap-agent.txt
x=$((x+1))
sleep 1
if [ "$x" -gt 20 ]; then
echo "(WW) no context file found. Mounting manually." >> /home/qt/bootstrap-agent.txt
break
fi
done
# establish mount path (differs per distro)
if ! ([ -f "/media/qt/CONTEXT/context.sh" ] || [ -f "/media/CONTEXT/context.sh" ] || [ -f "/run/media/qt/CONTEXT/context.sh" ]); then
MOUNTPATH="invalid"
if [ -d "/run/media/qt/CONTEXT" ]; then
MOUNTPATH="/run/media/qt/CONTEXT"
fi
if [ -d "/media/qt/CONTEXT" ]; then
MOUNTPATH="/media/qt/CONTEXT"
fi
if [ -d "/media/CONTEXT" ]; then
MOUNTPATH="/media/CONTEXT"
fi
# try mounting if unmounted
if [ -d "$MOUNTPATH" ]; then
if ! mount | grep "$MOUNTPATH" > /dev/null ; then
echo "(WW) context file not mounted..." >> /home/qt/bootstrap-agent.txt
echo "(WW) waiting 1 minute" >> /home/qt/bootstrap-agent.txt
sleep 60
echo "(**) mount /dev/sr0 $MOUNTPATH" >> /home/qt/bootstrap-agent.txt
sudo mount -r /dev/sr0 $MOUNTPATH
fi
fi
fi
if ([ -f "/media/qt/CONTEXT/context.sh" ] || [ -f "/media/CONTEXT/context.sh" ] || [ -f "/run/media/qt/CONTEXT/context.sh" ]); then
echo "(**) context found." >> /home/qt/bootstrap-agent.txt
else
echo "(EE) context not found. Starting bootstrap anyway." >> /home/qt/bootstrap-agent.txt
fi
/home/qt/bootstrap-agent /dev/ttyS0
EOF
# set owner and permissions
sudo chown qt:users $wrapper
sudo chmod 755 $wrapper

View File

@@ -48,11 +48,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
majorminorversion="3.21"
version="3.21.1"
majorminorversion="3.24"
version="3.24.2"
PrimaryUrl="http://ci-files01-hki.intra.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="591e3b0729ae07c37c1fa3c6adde7cc21387059d"
SHA1="12627c808674ee5f5bd3a6982176613bbd3ad9db"
targetFolder="/opt/cmake-$version"
appPrefix="cmake-$version-linux-x86_64"

View File

@@ -13,7 +13,7 @@ set(CMAKE_ASM_COMPILER cxintarm64)
set(EGL_FOUND True)
set(UNIX True)
set (CMAKE_C_COMPILE_FEATURES c_std_99)
set (CMAKE_C_COMPILE_FEATURES c_std_11)
set (CMAKE_CXX_COMPILE_FEATURES
cxx_alias_templates
cxx_alignas
@@ -69,7 +69,7 @@ set(CMAKE_C_FLAGS "-bsp $ENV{INTEGRITY_BSP} -os_dir $ENV{INTEGRITY_DIR} -non_sh
set(CMAKE_C_FLAGS_DEBUG "-g -Omaxdebug")
set(CMAKE_C_FLAGS_RELEASE "-Ospeed -Olink -Omax -no_uvfd")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --signed_fields --diag_suppress=1,82,228,236,381,611,961,997,1795,1931,1974,3148 --c++17 --thread_local_storage --exceptions --defer_parse_function_templates")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --signed_fields --diag_suppress=1,82,228,236,381,611,961,997,1795,1931,1974,3148 -std=c11 --c++17 --thread_local_storage --exceptions --defer_parse_function_templates")
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -frigor=accurate --signed_fields --no_implicit_include --link_once_templates -non_shared --new_outside_of_constructor --commons -I $ENV{QC_MULTIMEDIA_INC_DIR}")
set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})

View File

@@ -0,0 +1,72 @@
#!/usr/bin/env bash
############################################################################
##
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 3 as published by the Free Software
## Foundation and appearing in the file LICENSE.LGPL3 included in the
## packaging of this file. Please review the following information to
## ensure the GNU Lesser General Public License version 3 requirements
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 2.0 or (at your option) the GNU General
## Public license version 3 or any later version approved by the KDE Free
## Qt Foundation. The licenses are as published by the Free Software
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
## https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
#############################################################################
# This script will build and install FFmpeg static libs
set -ex
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
sudo apt install yasm
version="n5.0"
ffmpeg_name="FFmpeg-$version"
url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz"
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
sha1="1a979876463fd81e481d53ceb3cc117f0fce8521"
target_folder="$HOME"
app_prefix=""
InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_folder" "$app_prefix"
mkdir -p "$target_folder/$ffmpeg_name/build"
pushd "$target_folder/$ffmpeg_name/build"
../configure $ffmpeg_config_options --prefix=installed
make install -j
popd
SetEnvVar "FFMPEG_DIR" "$target_folder/$ffmpeg_name/build/installed"

View File

@@ -0,0 +1,57 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# This script installs flite from sources.
# Requires make, GCC and git to be in PATH.
set -ex
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
repName="flite"
gitUrl="https://github.com/festvox/$repName.git"
tmpdir="/tmp"
repDir="$tmpdir/$repName"
prefix="/usr"
rm -rf $repDir
cd $tmpdir
git clone $gitUrl >/dev/null
cd $repDir
git checkout v2.2 > /dev/null
./configure --with-pic --enable-shared --prefix=$prefix > /dev/null
make -j$(nproc) > /dev/null && sudo make install > /dev/null
rm -rf $repDir

View File

@@ -42,17 +42,17 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="2.31.1"
version="2.36.1"
officialUrl="https://github.com/git/git/archive/refs/tags/v$version.tar.gz"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/git/git-$version.tar.gz"
targetFile="/tmp/git-$version.tar.gz"
sha="859dbeaefd9cb6c590050b9cc4b83cb51e412410"
sha="a17c11da2968f280a13832d97f48e9039edac354"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
sourceDir="/tmp/git-$version-source"
mkdir $sourceDir
tar -xzf "$targetFile" -C $sourceDir
cd "$sourceDir/git-2.31.1"
cd "$sourceDir/git-$version"
installDir="$HOME/git"
make configure
./configure --prefix=$installDir

View File

@@ -48,9 +48,9 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
urlToolchainEs7="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_toolchain_es7_20042022.zip"
urlToolchainEs7="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_toolchain_es7_05102022.zip"
urlLibeglmegapack="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_libeglmegapack.zip"
SHA1_toolchainEs7="9e05277ec6a4610d4df565c3fbe24b9ce2a1f057"
SHA1_toolchainEs7="a95e11996d89218ac93493484e483d169976f565"
SHA1_Libeglmegapack="7f8ca64132eaea66202ea8db7f71f3300aab0777"
targetFolder="$HOME"
appPrefix=""

View File

@@ -60,9 +60,9 @@ DownloadAndExtract () {
rm -rf $file
}
aarch64le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
armv7le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
x8664_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
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/"
targetFolder="/opt/"
@@ -80,9 +80,9 @@ if [ ! -d "$targetFolder" ]; then
fi
# QNX SDP
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-20211207-linux.tar.xz"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz"
targetFile="qnx710.tar.xz"
sha1="03f87bad1c5522d6aefcc74dd5ccacd43240ded3"
sha1="134af2e0f75d7b7c516f824fafee265b89e51d48"
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
sudo cp $aarch64le_toolchain $targetPath

View File

@@ -25,7 +25,7 @@ function configure()
cat >output/option_files/post_start.opt_nfs <<EOF
echo "---> Starting NFS"
STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT
STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 -t 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT
EOF
fi

View File

@@ -0,0 +1,112 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 3 as published by the Free Software
## Foundation and appearing in the file LICENSE.LGPL3 included in the
## packaging of this file. Please review the following information to
## ensure the GNU Lesser General Public License version 3 requirements
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 2.0 or (at your option) the GNU General
## Public license version 3 or any later version approved by the KDE Free
## Qt Foundation. The licenses are as published by the Free Software
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
## https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
#############################################################################
# This script install Android sdk and ndk.
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
set -ex
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/android"
sdkTargetFolder="$targetFolder/sdk"
basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
toolsVersion="2.1"
# toolsFile dertermines tools version
toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersionLatest="r23b"
ndkVersionDefault="$ndkVersionLatest"
sdkBuildToolsVersion="31.0.0"
# this is compile sdk version
sdkApiLevel="android-31"
toolsSourceFile="$basePath/$toolsFile"
function InstallNdk() {
ndkVersion=$1
if [[ ! -d "${targetFolder}/android-ndk-${ndkVersion}" ]]; then
echo "Unzipping Android NDK $ndkVersion to '${targetFolder}'"
ndkSourceFile="$basePath/android-ndk-$ndkVersion-darwin*.zip"
sudo unzip -q "$ndkSourceFile" -d "$targetFolder"
fi
}
InstallNdk $ndkVersionDefault
InstallNdk $ndkVersionLatest
echo "Unzipping Android Tools to '$sdkTargetFolder'"
sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
echo "Changing ownership of Android files."
sudo chown -R qt:wheel "$targetFolder"
# Run the following command under `eval` or `sh -c` so that the shell properly splits it
sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'"
sudo mkdir "$sdkTargetFolder/cmdline-tools"
sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \
"platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \
| eval $sdkmanager_no_progress_bar_cmd
echo "Checking the contents of Android SDK..."
ls -l "$sdkTargetFolder"
SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$targetFolder/android-ndk-$ndkVersionDefault"
SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
echo "Android NDK = $ndkVersionDefault" >> ~/versions.txt

View File

@@ -48,11 +48,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
majorminorversion="3.21"
version="3.21.1"
majorminorversion="3.24.2"
version="3.24.2"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
SHA1="5845da632d0f073c7761df4e78efb4405e00ac5a"
SHA1="19b1473e6ded2d234256b6aac90eb22616c5ab5e"
appPrefix="cmake-$version-macos-universal"
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

View File

@@ -3,7 +3,6 @@
#############################################################################
##
## Copyright (C) 2021 The Qt Company Ltd.
## Copyright (C) 2017 Pelagicore AG
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -39,22 +38,12 @@
## $QT_END_LICENSE$
##
#############################################################################
set -ex
# This script installs python2
# Prevent applications from re-opening after re-boot.
# This is needed only with physical mac mini machines used in ci.
# shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
# shellcheck source=./pip.sh
source "${BASH_SOURCE%/*}/../common/macos/pip.sh"
InstallPip python2.7
/usr/local/bin/pip install virtualenv
SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH"
echo "python2 = 2.7.16" >> ~/versions.txt
set -e
sudo chown root ~/Library/Preferences/ByHost/com.apple.loginwindow*
sudo chmod 000 ~/Library/Preferences/ByHost/com.apple.loginwindow*

View File

@@ -74,7 +74,7 @@ function InstallXCode() {
echo "Versioning application bundle"
majorVersion=$(echo $version | cut -d '.' -f 1)
versionedAppBundle="/Applications/Xcode${majorVersion}.app"
sudo mv /Applications/Xcode.app ${versionedAppBundle}
sudo mv /Applications/Xcode*.app ${versionedAppBundle}
echo "Selecting Xcode"
sudo xcode-select --switch ${versionedAppBundle}

View File

@@ -46,7 +46,7 @@ set -ex
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
brew install ${BASH_SOURCE%/*}/libiodbc.rb $*
brew install --formula ${BASH_SOURCE%/*}/libiodbc.rb $*
# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc

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