Compare commits

..

188 Commits
6.5.2 ... 6.4

Author SHA1 Message Date
Oliver Wolff
e83e6f73f9 Provisioning: MSVC 2019 update: Add Vswhere helper function
Change-Id: Idd6bf24450d9447c38c39c64abff5b55d71c12b9
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
(cherry picked from commit 37c0cf82ae)
2023-03-24 08:50:58 +01:00
Qt Submodule Update Bot
a03b71324b Update submodules on '6.4 in qt/qt5'
Change-Id: I59861b843d2702f0155aa645eb6f1fdf02e50a65
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-22 04:13:47 +00:00
Samuel Mira
f6d3fc13df Enable ffmpeg for Android
After ffmpeg was removed on Android targets following QTBUG-110172,
this patch enables it after fixing the failing test.

Task-number: QTBUG-110453
Change-Id: I5598a9b72d06af6664455e933129a08192afac15
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit b9c2512748)
2023-02-16 18:41:58 +00:00
Heikki Halmet
840e61affe Fix tqtc-android-automotive Id
Current id won't work when including cmake_platforms_target_android.yaml

Change-Id: I6dc488e5bf683608f567dcc2871e3c1861990e32
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a915ead6ac)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2023-02-11 16:22:19 +00:00
Toni Saario
ba0ed5a148 Fix ubuntu 20 id in precheck yaml
Amends 92ae8eb4ca

Change-Id: I098a45856ab3197d180c58dd595a790f1b7a1fc0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit bcf5c6680c)
2023-02-11 16:22:13 +00:00
Heikki Halmet
31d81491a4 Fix Id for Windows 11 arm64 target
Change-Id: I68f751b33a0ea23f674c7ce4e63da9de830305cf
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit c3d5a51de4)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2023-02-11 16:22:11 +00:00
Heikki Halmet
ec169f0592 Fix nightly run for Android latest
There's a bug or feature in Coin which makes Coin to include all
dependencies which are in this case under cmake_platforms and yaml-files
which are included to cmake_platforms. Because of that we can't include
macos.yaml separately.

Change-Id: Ie4a019e07f8b30f6ef18405446947d96a592d4a2
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-02-11 16:22:07 +00:00
Heikki Halmet
68a04a3fe4 Add OpenSSL to the PATH for linux targets
This is required by QtApplicationmanager with openSUSE target

Change-Id: Ia27353d56c162461eb7f38700cd0ea56cce16e6b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 6f1b182a6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-11 16:22:04 +00:00
Heikki Halmet
9d7f75d34b Add ID for all targets
All targets should have ID. This way it's easier to refer to needed
target

Change-Id: I0af8399c3a4c436ab1e778ab4396c65ccd3a373b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 92ae8eb4ca)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-02-11 16:22:02 +00:00
Heikki Halmet
cde0e8a450 Provisioning: Add Docker for macOS
Needed by RTA tests

Task-number: QTQAINFRA-5171
Change-Id: I26ac10421ba32d68ffdef523fd97f710cd6bcaab
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit e266a9e604)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-11 07:16:30 +00:00
Qt Submodule Update Bot
4556a1a1de Update submodules on '6.4 in qt/qt5'
Change-Id: I8687a58a56aea2b1881dada5f98f80367897f627
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-11 02:43:48 +00:00
Heikki Halmet
09b9a9e95d Provisioning: Update Docker
This change will upgrade docker-compose version to v2.15.1
Also 'containerd', 'docker-ce' and 'docker-ce-cli' versions will be
upgraded to support newer Ubuntu version (20.04)

Task-number: QTQAINFRA-5396
Change-Id: I282a1cbc5870db765409985983d29f57936d1798
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 739cc29b77)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-10 06:52:28 +00:00
Qt Submodule Update Bot
fb24a6656a Update submodules on '6.4 in qt/qt5'
Change-Id: I92d7fa3bab9fb656dace7c5d4f10a4c7f4a715fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-07 18:45:42 +00:00
Simo Fält
4a58eaaea8 Provisioning: Update Python3 from 3.7 to 3.8
Change-Id: I0884e87fbc56e4e1060406b2fc214b33c40c475c
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit 5b22f8ec2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-02 07:26:01 +00:00
Qt Submodule Update Bot
b47298368a Update submodules on '6.4 in qt/qt5'
Change-Id: Ie3eb0697c8c3da0938d08167cc01f3e1eef4446e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-01 00:39:24 +00:00
Qt Submodule Update Bot
80fdd2fe8b Update submodules on '6.4 in qt/qt5'
Change-Id: Ifefff975c18bf3f42bbb2d499027d3aeab4f554f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-24 18:08:56 +00:00
Oliver Wolff
79a5ee62d6 provisioning: Check successful installation of MSVC 2019 update
Using vswhere we can make sure if the MSVC 2019 update finished with the
right version. For further safety we check, if the installation is
complete and launchable.

Change-Id: I90e84bf4922647b4ff30ba93a207b9d5e1a96120
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit bc4797a7e8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-24 09:34:57 +00:00
Oliver Wolff
04cc50669c provisioning: Make sure that MSVC 2019 version is added to versions.txt
If MSVC 2022 is installed in CI machines, vswhere -latest without any
additional version information will return the latest version of 2022.
By limiting the version range (>=16, <17) we make sure that only the
latest version of MSVC 2019 is returned.

Change-Id: I8f92099f030660c1914ffb728efc9a55eadf4808
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 37f4d821b8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-24 09:34:53 +00:00
Qt Submodule Update Bot
171c611b69 Update submodules on '6.4 in qt/qt5'
Change-Id: I295954686fb99a03e23a0ccd3ae53117d9e83c43
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-23 15:35:59 +00:00
Heikki Halmet
096e9c86d7 Remove ffmpeg for Android
This is causing autotest failures in multimedia.

Task-number: QTBUG-110453
Change-Id: I1eacd8eec72d4f17f7f18df9f70c07bbecc0d48b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 7051182f20)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-23 12:12:37 +00:00
Qt Submodule Update Bot
2cba97ff97 Update submodules on '6.4 in qt/qt5'
Change-Id: I2848f768b2e3639a34e7db360166eab9e5dd5ea3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-20 21:46:27 +00:00
Qt Submodule Update Bot
71ca50c6a4 Update submodules on '6.4 in qt/qt5'
Change-Id: I52af63b46a7a884f870a980aec274106e69374e5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-19 04:24:48 +00:00
Artem Dyomin
90b6629802 Update ffmpeg version to 5.1 for desktop platforms
Some issues have been fixed in ffmpeg 5.1, e.g, with videotoolbox.
So the update at least fixes our playback
of some video formats on macos, e.g. provided in the related bug.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Amends eee152ca70

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Added the execute permission to the ubuntu scripts.

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

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

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

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

Change-Id: I2bbfe1a23622deb90e7641b322ad9eac3ae4a112
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 64a715e8be)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-21 10:50:00 +00:00
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
376 changed files with 1049 additions and 4916 deletions

1
.gitignore vendored
View File

@@ -2,4 +2,3 @@ Makefile
.qmake.cache
.qmake.super
*.pro.user*
CMakeUserPresets.json

96
.gitmodules vendored
View File

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

View File

@@ -1,6 +1,6 @@
# The real minimum version will be checked by the qtbase project.
# 3.16 is the absolute minimum though.
cmake_minimum_required(VERSION 3.16...3.21)
cmake_minimum_required(VERSION 3.16...3.20)
# set QT_SUPERBUILD early, so that qtbase/.cmake.conf can check it
@@ -34,7 +34,7 @@ if (NOT QT_BUILD_STANDALONE_TESTS)
list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin")
endif()
include(QtTopLevelHelpers)
include("QtTopLevelHelpers")
include(ECMOptionalAddSubdirectory)
# Also make sure the CMake config files do not recreate the already-existing targets
@@ -52,21 +52,12 @@ if(NOT QT_BUILD_SUBMODULES)
endif()
set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build")
foreach(module IN LISTS QT_BUILD_SUBMODULES)
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${module}/CMakeLists.txt)
message(FATAL_ERROR
"Module '${module}' cannot be found. Please double-check the "
"spelling and try again. Or run `./init-repository` to get "
"the submodules.")
endif()
endforeach()
qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES)
foreach(module IN LISTS QT_BUILD_SUBMODULES)
# Check for unmet dependencies
if(NOT DEFINED BUILD_${module} OR BUILD_${module})
message(STATUS "Checking dependencies of submodule '${module}'")
message(NOTICE "Checking dependencies of submodule '${module}'")
get_property(required_deps GLOBAL PROPERTY QT_REQUIRED_DEPS_FOR_${module})
get_property(dependencies GLOBAL PROPERTY QT_DEPS_FOR_${module})
foreach(dep IN LISTS dependencies)
@@ -93,7 +84,7 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES)
"but ${error_reason}.\n"
"Note: Use '-skip ${module}' to exclude it from the build.")
else()
message(STATUS "Skipping optional dependency '${dep}' of '${module}', "
message(NOTICE "Skipping optional dependency '${dep}' of '${module}', "
"because ${error_reason}.")
endif()
endif()
@@ -101,12 +92,8 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES)
endif()
endforeach()
if(NOT DEFINED CMAKE_MESSAGE_CONTEXT_SHOW)
set(CMAKE_MESSAGE_CONTEXT_SHOW TRUE)
endif()
foreach(module IN LISTS QT_BUILD_SUBMODULES)
message(STATUS "Configuring submodule '${module}'")
message(NOTICE "Configuring submodule '${module}'")
ecm_optional_add_subdirectory("${module}")
if(module STREQUAL "qtbase")

View File

@@ -1061,7 +1061,6 @@ The Agreement includes following Appendices 1-10, as applicable.
- Appendix 8: Intentionally left blank (optional)
- Appendix 9: Support Terms
- Appendix 10: Conversion from legacy Licenses to Subscription (optional)
- Appendix 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY
APPENDIX 1: LICENSED SOFTWARE
@@ -1253,7 +1252,7 @@ only ("Redistributables") are marked with "R" in the below table.
+----------------------------------------------------------+
| Device Utilities | | | X,R | X,R |
+----------------------------------------------------------+
| Qt Debugging Bridge (QDB) Daemon | | | X,R | X,R |
| Qt Debugging Bridge (QBD) Daemon | | | X,R | X,R |
+----------------------------------------------------------+
| Qt Quick Ultralite Controls | | | X,R | X,R |
+----------------------------------------------------------+
@@ -1669,152 +1668,116 @@ Content Format and Channel as mentioned in paragraph 3 and 4.
APPENDIX 8: INTENTIONALLY LEFT BLANK
APPENDIX 9: SUPPORT TERMS
Version 2023-04
These Qt support terms and conditions (Support Terms) set forth the legal
framework, where under The Qt Company (The Qt Company) provides support
These Qt support terms and conditions ("Support Terms") set forth the legal
framework, where under The Qt Company ("The Qt Company") provides support
services (as herein defined) to the Licensee.
1 DEFINITIONS
Application Code shall mean a computer software program written strictly
"Application Code" shall mean a computer software program written strictly
using the Qt programming language, by or for the Licensee, with a user
interface, enabling the Licensee or their users to accomplish a specific task
and display any results of the task on the display monitor or screen.
“Customer Portal” shall mean The Qt Companys web-based service and support
user interface located at https://account.qt.io/ or at another location
designated by The Qt Company. Customer Portal is used by a Designated User with
Qt Account, and it provides downloads, license management, license certificate
and other services for Designated Users.
"Dedicated Contact" shall mean the employee of The Qt Company who will be the
first point of contact for all Designated Users' requests for Support.
“Dedicated Contact” shall mean the employee of The Qt Company who will be the
first point of contact for all Designated Users requests for Support.
“Errors” shall mean an error, flaw, mistake, failure, or fault in Licensed
"Errors" shall mean an error, flaw, mistake, failure, or fault in Licensed
Software that prevents it from behaving as described in the relevant
documentation or as agreed between the Parties. Designated User can follow the
state and progress of Errors in Customer Portal.
documentation or as agreed between the Parties.
Extended Support shall mean a continuation to the normal Support period,
"Extended Support" shall mean a continuation to the normal Support period,
which allows Designated Users to receive selected Support (Standard Support or
Premium Support) for a version of Licensed Software that is no longer generally
supported by The Qt Company.
Install Support shall mean Support that is limited to installation-related
"Install Support" shall mean Support that is limited to installation related
Error(s) on Development Platforms specified as supported host platforms for
each Qt release under doc.qt.io. Install Support covers also operational use of
the QA Tools, but not operational use of Qt Software.
each Qt release under doc.qt.io.
Maintenance Release shall mean a release or version of Licensed Software
"Maintenance Release" shall mean a release or version of Licensed Software
containing bug fixes, error corrections and other changes targeted to
maintaining and improving product stability and quality. Maintenance Releases
are generally depicted as a change to the third digit of Licensed Software
version number.
Platforms shall mean both Development Platforms and Deployment Platforms.
"Platforms" shall mean both Development Platforms and Deployment Platforms.
Supported host and target Platforms may vary from for each Qt release as
defined under doc.qt.io.
Premium Support shall mean an upgraded level of Support that The Qt Company
"Premium Support" shall mean an upgraded level of Support that The Qt Company
provides pursuant to these Support Terms to Licensee if Licensee has purchased
Premium Support instead of Standard Support. Premium Support also covers what
is included in Standard Support. Premium Support shall always be purchased for
all Designated User(s) in the respective development team of the Licensee.
Premium Support instead of Standard Support. Premium Support shall always be
purchased for all Designated User(s) in the respective development team of the
Licensee.
“Qt Account” shall mean the Qt Account for a Designated User used for using Qt
services and Customer Portal. A Qt Account is mapped to the Licensee company
with the corporate email domain or domains.
”Qualification Kit” shall mean a set of documents and validation test cases
used for product certification needs as defined in section 2.6.
“Response Time” shall mean the period of time from when Licensee notifies The
Qt Company about an Error or requests Support until The Qt Company provides
"Response Time" shall mean the period of time from when Licensee notifies
TheQt Company about an Error or requests Support until The Qt Company provides
Licensee with a response that addresses (but not necessarily resolves) the
reported Error or provides the requested Support.
Standard Support shall mean standard level of Support that The Qt Company
provides pursuant to these Support Terms to Licensee. Standard Support also
covers what is included in Install Support.
"Standard Support" shall mean standard level of Support that The Qt Company
provides pursuant to these Support Terms to Licensee.
“Security Issue” shall mean an Error that may cause a vulnerability in a system
or application that uses the Licensed Software.
"Support" shall mean developer assistance that is provided by The Qt Company
to assist eligible Designated Users in Licensed Software installation, usage
and functionality problem resolution for Error(s) and Error workarounds
pursuant to the terms of these Support Terms. Support for different products is
available as specified in the below table ("X" marking the Support that is
included in the license price, optional Add-on Support services are marked as
"O"):
“Support” shall mean developer assistance that is provided by The Qt Company to
assist eligible Designated Users in Licensed Software installation, usage and
functionality problem resolution for Error(s) and Error workarounds pursuant to
the terms of these Support Terms. Support for different products is available
as specified in the below table (X marking the Support that is included in
the license price, optional Add-on Support services are marked as O):
+-----------------------------------------------------------------------+
| |ADP|ADE|DCP|DCE|DSP|DSE|Squish|Coco|Test Center|
+-----------------------------------------------------------------------+
| Install Support | X | X | X | X | X | X | X | X | X |
+-----------------------------------------------------------------------+
| Standard Support | | X | X | X | X | X | X | X | X |
+-----------------------------------------------------------------------+
| Premium Support | | O | O | O | O | O | O | O | O |
+-----------------------------------------------------------------------+
| Extended Support | | O | O | O | O | O | | | |
+-----------------------------------------------------------------------+
| Tool Qualification Kit| | | | | | | O | O | |
+-----------------------------------------------------------------------+
+-----------------------------------------------------------------------------+
| | Install| Standard| Premium| Extended| Qualification|
| | Support| Support | Support| Support | Kit |
+-----------------------------------------------------------------------------+
| DSP | X | X | O | O | |
+-----------------------------------------------------------------------------+
| DSE | X | X | O | O | |
+-----------------------------------------------------------------------------+
| ADP | X | | | | |
+-----------------------------------------------------------------------------+
| ADE | X | X | O | O | |
+-----------------------------------------------------------------------------+
| DCP | X | X | O | O | |
+-----------------------------------------------------------------------------+
| DCE | X | X | O | O | |
+-----------------------------------------------------------------------------+
| Squish | X | X | O | | O |
+-----------------------------------------------------------------------------+
| Coco | X | X | O | | O |
+-----------------------------------------------------------------------------+
| Test Center | X | X | O | | O |
+-----------------------------------------------------------------------------+
| Axivion Suite | X | X | | | |
+-----------------------------------------------------------------------------+
| Architecture Analysis | X | X | | | |
+-----------------------------------------------------------------------------+
| Static Code Analysis | X | X | | | |
+-----------------------------------------------------------------------------+
| Static Coverage | X | X | | | |
| Analysis Professional | | | | | |
+-----------------------------------------------------------------------------+
| Qt Insight | | X | | | |
+-----------------------------------------------------------------------------+
“Support Validity Term” shall mean the Development License Term or any other
fixed time period agreed between the Parties during which time the Licensee is
"Support Validity Term" shall mean the Development License Term or any other
fixed time period agreed between the Parties during which time the Customer is
eligible to receive Support from The Qt Company.
"Tool Qualification Kit" shall mean a customized set of documents and
validation test cases.
2 SUPPORT SERVICES
2.1 Support Services Provided by The Qt Company
Subject to these Support Terms and during the Support Validity Term, The Qt
Company will via its Customer Portal, provide Designated User(s) with Support
for the Licensed Software which Licensee has licensed under the Agreement. The
Qt Company will make commercially reasonable efforts to solve any Errors
reported by Designated User(s). Resolution of an Error may be provided through
Company will via its web-based support user-interface, provide Designated
User(s) with Support for the Platforms which Customer has licensed under the
Agreement.
The Qt Company will make commercially reasonable efforts to solve any Errors
reported by Designated User(s). Resolution of an Error may be provided through
Designated User(s) themselves downloading of a later released version of the
applicable Licensed Software product(s) or providing the Designated User with a
workaround addressing such Error or providing the Designated User with an
updated tool configuration.
temporary workaround addressing such Error.
2.2 Licensee's Obligations
To report an Error, the Designated User shall register the Error on the
Customer Portal. If the Designated User considers the reported Error to be a
Security Issue, the Error shall be marked as a Security Issue.
To report an Error, the Designated User shall register the Error on The Qt
Company's web-based support user interface located at:
https://account.qt.io/login or at another location designated by The Qt Company.
The Designated User must provide adequate information and documentation to The
Qt Company to enable it to recreate the Error or problem for which the
Designated User has sought assistance. To ensure efficient handling of Errors,
the Designated User must provide the following information, where relevant:
Designated User has sought assistance.
To ensure efficient handling of Errors, the Designated User must provide the
following information, where relevant:
- A clear, detailed description of the problem, question or suggestion;
- Identification of which Licensed Software product and version is affected;
- Identification of the operating environment (e.g. operating system, hardware
Platform, build tools, tool configuration, etc.) on which the problem exists;
- Marking the issue as a Security Issue, when reporting a Security Issue;
Platform, build tools, etc.) on which the problem exists;
- On Standard Support: A complete and compilable test case of not more than 500
lines of code that demonstrates the problem;
- On Premium Support: A complete and compilable test case that demonstrates the
@@ -1836,30 +1799,29 @@ General limitations:
Each version or release of the Licensed Software will be Supported under
Standard Support or Premium Support only for limited time period as set forth
in doc.qt.io or in documentation provided with the respective Licensed Software
product. If nothing is documented, a release of Licensed Software is supported
for one (1) year from the release date of the version x.y.0 and Long Term
Support (LTS) Releases are supported for a period of three (3) years from the
release date of the LTS version x.y.0.
in doc.qt.io. For example, regular releases of Qt Software are supported for
one (1) year from the release date of the version x.y.0 and Long Term Support
(LTS) Releases are supported for a period of three (3) years from the release
date of the LTS version x.y.0.
The Qt Company shall only provide Support for Designated User(s) through
Customer Portal.Support is made available for the entire development teams
only: It is not allowed to purchase Support only for some members of the
development team, and all Designated Users of the respective development team
must be eligible for the same level of Support.
The Qt Company shall only provide Support for Designated User(s).
Support is made available for the entire development teams only: It is not
allowed to purchase Support only for some members of the development team, and
all Designated Users of the respective development team must be eligible for
the same level of Support.
Support is not provided for snapshots, preview releases, beta releases or
release candidates.
The Qt Company shall have no obligation to provide Support for 3rd party
components, hardware or operating system specific problems or problems arising
from improper use, accident, neglect, or modification of Qt.
The Qt Company shall have no obligation to provide Support for hardware or
operating system specific problems or problems arising from improper use,
accident, neglect or modification of Qt.
Limitations with Install Support:
Support limited to (i) Error(s) regarding installation and setting up of the Qt
development environment on host Platforms, or (ii) Errors impacting operational
use of the QA Tools.
Support limited to Error(s) regarding installation and setting up of the Qt
development environment on host Platforms.
Limitations with Standard Support:
@@ -1885,60 +1847,31 @@ will make commercially reasonable efforts to provide a solution on closest
corresponding supported Platform.
Premium Support is optional and purchased for an agreed bucket of hours
(Bucket). Hours can be used by any Designated User in the respective
("Bucket"). Hours can be used by any Designated User in the respective
development team. To encourage continuous usage of the Support, ten percent
(10%) of the purchased Bucket shall automatically expire (regardless of whether
such support hours are actually used or not by the Licensee) each month after
three (3) months from the purchase of the Premium Support.
2.4 Handling of Security Issues
The reported Errors marked as Security Issues will be assessed by experts to
determine the severity of the issue and to verify if it indeed is a valid
Security Issue. The Designated User who reported the issue may be contacted for
more details. If the reported issue is not deemed to be a Security Issue, it
will be treated as a normal Error and handled accordingly.
A verified Security Issue will be fixed as soon as possible. Qt Company will
notify all Licensees via appropriate channels about the Security Errors and
availability of patches for Licensed Software. Typically, a fix for the
Security Issue is included in the next Maintenance Release of Licensed
Software.
If the Security Issue is reported in a third-party library used in Licensed
Software, The Qt Company will notify the relevant third party of such Security
Issue detected in their library. When the Security Issue is fixed in the
third-party library, the new version of the third-party library will be in the
next feasible Maintenance Release of the Licensed Software. If a fixed version
of the third-party library is not available, The Qt Company may instead decide
to include documentation regarding the issue, or a patch for this third-party
library.
All known Security Issues in Licensed Software will be mentioned as part of the
change notes released with each version of Licensed Software.
2.5 Extended Support
2.4 Extended Support
Extended Support extends the Support Validity Term for a release of Licensed
Software that is no longer generally supported.
Extended Support includes and is by default provided with Standard Support
rules and limitations, unless Extended Support is purchased together with
Premium Support in which case Premium Support rules and limitations will apply.
rules and limitations, unless Extended Support is purchased with Premium
Support in which case Premium Support rules and limitations will apply.
Extended Support is optional and purchased with annual fee and separately per
each Licensee product. Extended Support will need definition of (i) Licensee
product, (ii) used Platform(s) and (iii) Licensed Software version(s). For
avoidance of doubt, Extended Support requires that the Designated User has a
valid license for the respective Licensed Software.
product, (ii) used Platform(s) and (iii) Licensed Software version(s).
2.6 Qualification Kit
2.5 Tool Qualification Kit
The Qt Company shall provide a set of documents and validation tests that
enable the Licensee to qualify QA testing tool (subject to a separate fee) or
Qt Safe Renderer for the purpose of safety certification of Licensee end-to-end
solution. Exact complied safety standards may vary between products, used
features, use case, and industry.
The Qt Company shall provide set of customized documents and validation tests
that enable Licensee to qualify QA testing tool for the purpose of ISO 26262,
EN 50128, DO-330, IEC 61508, IEC 62304 or IEC 13485 certification Licensee end
to end solution.
3 RESPONSE TIME
@@ -1951,9 +1884,6 @@ exceed two (2) business days.
Premium Support: Errors and Support requests will have a Response Time not to
exceed one (1) business day.
Security Issues: Errors that are Security Issues will have a Response Time not
to exceed one (1) business day.
For complex issues, The Qt Company may provide an initial response to the
Designated User and then follow up, without undue delay, with additional
communication before an Error is properly addressed or Support provided.
@@ -1977,7 +1907,7 @@ All Support requests will be handled with high priority.
5 MAINTENANCE RELEASES, UPDATES AND UPGRADES
Under the Support the Licensee is eligible for Maintenance Releases and Updates
Under the Support the Customer is eligible for Maintenance Releases and Updates
that The Qt Company generally makes available to customers who has purchased
Support. Unless otherwise decided by The Company at its free and absolute
discretion, Upgrades will not be provided under the Support.
@@ -1989,7 +1919,6 @@ previous version of Licensed Software:
- Fixes related to build issues on supported Platforms;
- Error corrections specific to a single Platform that are not present on other
Platforms;
- Corrections to Security Issues;
- Critical Error corrections such as crashes, data corruption, loss of data,
race conditions; and
- Updates to documentation and license information when deemed necessary by
@@ -2046,46 +1975,3 @@ remain outstanding on the Current Licenses under the applicable terms Licensee
will continue to make such payments in accordance with the applicable order
documentation, notwithstanding the fact that the Current Licenses are being
converted to Development Licenses pursuant to this Appendix.
APPENDIX 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY
Version 1.0
Qt Insight Tracker Library ("Tracker Library") is a software module used to
collect end user data from Customer's Application and Devices relating to The
Qt Company's Qt Insight online service the Customer is ordering from The Qt
Company under a separate service agreement ("Service Agreement").
Unless otherwise set forth herein, definitions written in capital letters used
herein shall have the meaning set forth in the Service Agreement.
Subject to these terms The Qt Company grants to Customer a worldwide,
non-exclusive, non-transferable, royalty-free, revocable (for cause) right and
license, valid for the term of the Service Agreement, to
(i) use, copy and modify Tracker Library for the purpose of including it
into the Devices and Applications and solely for the purpose of being
used only in conjunction with Insight Cloud or Insight Private Cloud,
and
(ii) distribute, by itself or through its Contractors, Tracker Library as
installed, incorporated, or integrated into Applications and/or
Devices.
Use of Tracker Library in a way or for the purpose other than the above is
strictly prohibited. Tracker Library is licensed to the Customer in all
respects "as is".
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF
ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
NON-INFRINGEMENT WITH REGARD TO THE TRACKER LIBRARY. THE QT COMPANY DOES NOT
WARRANT THAT THE TRACKER LIBRARY WILL SATISFY CUSTOMER'S REQUIREMENTS OR THAT
IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE
UNINTERRUPTED.
IN NO EVENT SHALL THE QT COMPANY BE LIABLE TO THE CUSTOMER FOR ANY LOSS OF
PROFIT, LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT,
SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY
KIND, HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THE USE OF THE TRACKER
LIBRARY.
THE TOTAL MAXIMUM LIABILITY OF THE QT COMPANY UNDER THESE TERMS SHALL IN NO
EVENT EXCEED 10,000 EUROS.

View File

@@ -1,19 +1,17 @@
OBTAINING QT 6 FROM GIT
=======================
OBTAINING QT5 FROM GIT
======================
Synopsis
========
For a more in-depth description on how to build Qt 6 from git,
please see: http://wiki.qt.io/Building_Qt_6_from_Git
For a more in-depth description on how to build Qt5 from git,
please see: http://wiki.qt.io/Building_Qt_5_from_Git
Note that, although the git module is called qt5.git, the dev and 6.x branches
do contain Qt 6!
Get The Submodules
==================
Cloning qt5.git does not automatically clone all submodules.
Cloning Qt5 does not automatically clone all submodules.
To get the submodules, it is recommended to use the `init-repository' script.
./init-repository
@@ -51,7 +49,7 @@ OBTAINING QT 6 FROM GIT
Developing and Contributing to Qt
=================================
================================
For more information on how to develop and contribute to Qt, please see:
http://wiki.qt.io/Category:Developing_Qt

View File

@@ -1,19 +1,23 @@
HOW TO BUILD Qt 6
=================
HOW TO BUILD Qt6
================
Synopsis
========
System requirements
-------------------
------------------
* CMake 3.18 or later
* Perl 5.8 or later
* Python 2.7 or later
* C++ compiler supporting the C++17 standard
* CMake 3.16 or newer
* Ninja 1.8 or newer
* Python 3
For more details, see also https://doc.qt.io/qt-6/build-sources.html
It's recommended to have ninja 1.8 or later installed.
For other platform specific requirements,
please see section "Setting up your machine" on:
http://wiki.qt.io/Get_The_Source
Linux, Mac:
-----------
@@ -30,7 +34,9 @@ Windows:
1. Open a command prompt.
2. Ensure that the following tools can be found in the path:
* Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 8.1 or later)
* Python 3 ([https://www.python.org/downloads/windows/] or from Microsoft Store)
* Perl version 5.12 or later [http://www.activestate.com/activeperl/]
* Python version 2.7 or later [http://www.activestate.com/activepython/]
* Ruby version 1.9.3 or later [http://rubyinstaller.org/]
```
cd <path>\<source_package>
@@ -40,14 +46,13 @@ cmake --build .
More details follow.
Build!
======
Qt is built with CMake, and a typical
`configure && cmake --build .` build process is used.
If Ninja is installed, it is automatically chosen as CMake generator.
If ninja is installed, it is automatically chosen as CMake generator.
Some relevant configure options (see configure -help):
@@ -96,8 +101,7 @@ to your `PATH` environment variable to access them.
Building Qt from git
====================
=====================
See http://wiki.qt.io/Building_Qt_6_from_Git and README.git
for more information.
See http://wiki.qt.io/Qt_6 for the reference platforms.

View File

@@ -11,7 +11,7 @@
# Webkit style was loosely based on the Qt style
BasedOnStyle: WebKit
Standard: c++17
Standard: Cpp11
# Column width is limited to 100 in accordance with Qt Coding Style.
# https://wiki.qt.io/Qt_Coding_Style
@@ -62,8 +62,6 @@ NamespaceIndentation: None
# Allow indentation for preprocessing directives (if/ifdef/endif). https://reviews.llvm.org/rL312125
IndentPPDirectives: AfterHash
# We only indent with 2 spaces for preprocessor directives
PPIndentWidth: 2
# Horizontally align arguments after an open bracket.
# The coding style does not specify the following, but this is what gives
@@ -87,21 +85,6 @@ ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCH
# Break constructor initializers before the colon and after the commas.
BreakConstructorInitializers: BeforeColon
# Add "// namespace <namespace>" comments on closing brace for a namespace
# Ignored for namespaces that qualify as a short namespace,
# see 'ShortNamespaceLines'
FixNamespaceComments: true
# Definition of how short a short namespace is, default 1
ShortNamespaceLines: 1
# When escaping newlines in a macro attach the '\' as far left as possible, e.g.
##define a \
# something; \
# other; \
# thelastlineislong;
AlignEscapedNewlines: Left
# Avoids the addition of a space between an identifier and the
# initializer list in list-initialization.
SpaceBeforeCpp11BracedList: false

View File

@@ -2,7 +2,3 @@ type: Group
instructions:
- !include "{{qt/qt5}}/coin_qt_configure.yaml"
- !include "{{qt/qt5}}/coin_qt_build_docs.yaml"
disable_if:
condition: property
property: features
contains_value: "TargetBuildOnly"

View File

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

View File

@@ -7,37 +7,23 @@ Include: [
macos.yaml
]
Configurations:
# Build on Ubuntu 22.04 and test on both X11 and Wayland later
-
Id: 'ubuntu-22.04-documentation'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Id: 'ubuntu-20.04-documentation'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure', 'DoNotRunTests']
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
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-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Id: 'ubuntu-20.04'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
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',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
# Test on Ubuntu 22.04 X11
-
Id: 'ubuntu-22.04-documentation-x11-tests'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'ubuntu-22.04-documentation'
-
Id: 'ubuntu-22.04-x11-tests'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'ubuntu-22.04'
-
Id: 'opensuse-15.4-developer-build'
Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
@@ -46,9 +32,7 @@ Configurations:
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
]
-
Id: 'sles-15_sp4-static'
@@ -57,8 +41,7 @@ Configurations:
Features: ['Sccache', 'DisableTests', 'UseConfigure']
Configure arguments: '-nomake examples -static -no-sql-mysql'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
]
-
Id: 'windows-10_22h2-msvc2019'
@@ -70,10 +53,7 @@ Configurations:
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
-
Id: 'windows-11_22h2-msvc2019'
Template: 'qtci-windows-11_22H2-x86_64-50'
@@ -83,10 +63,7 @@ Configurations:
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}']
-
Id: 'windows-10_22h2-msvc2022'
Template: 'qtci-windows-10_22H2-x86_64-50'
@@ -94,11 +71,9 @@ Configurations:
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Id: 'windows-11_22h2-msvc2022'
@@ -109,9 +84,7 @@ Configurations:
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Id: 'windows-10_22h2-msvc2019-developer-build'
@@ -122,9 +95,7 @@ Configurations:
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
]
-
Id: 'windows-10_22h2-msvc2019-arm64'
@@ -140,21 +111,17 @@ Configurations:
'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}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'
]
-
Id: 'windows-11_22h2-msvc2019-developer-build'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
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}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
]
-
Id: 'windows-11_22h2-msvc2019-arm64'
@@ -167,9 +134,7 @@ Configurations:
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64'
]
-
Id: 'rhel-8.4'
@@ -177,17 +142,6 @@ Configurations:
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
-
Id: 'rhel-9.0'
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies']
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
@@ -218,9 +172,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 -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'
]
-
Id: 'windows-10_22h2-llvm'
@@ -232,9 +184,7 @@ Configurations:
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
'LLVM_INSTALL_DIR=C:\llvm-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
'LLVM_INSTALL_DIR=C:\llvm-mingw'
]
-
Id: 'windows-11_22h2-llvm'
@@ -246,9 +196,7 @@ Configurations:
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
'LLVM_INSTALL_DIR=C:\llvm-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
'LLVM_INSTALL_DIR=C:\llvm-mingw'
]
-
Id: 'windows-10_22h2-mingw11-developer-build'
@@ -260,9 +208,7 @@ Configurations:
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
]
-
Id: 'windows-11_22h2-mingw11-developer-build'
@@ -274,7 +220,5 @@ Configurations:
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
]

View File

@@ -2,15 +2,15 @@ Version: 2
Configurations:
-
Id: 'qemu-armv7-developer-build'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
Target arch: 'armv7'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Platform dependency: 'ubuntu-20.04'
Features: ['Sccache', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'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.24.2/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
@@ -19,15 +19,15 @@ Configurations:
]
-
Id: 'qemu-arm64-developer-build'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Platform dependency: 'ubuntu-20.04'
Features: ['Sccache', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'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.24.2/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
@@ -36,15 +36,15 @@ Configurations:
]
-
Id: 'qemu-mips64-developer-build'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
Target arch: 'mips64'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Platform dependency: 'ubuntu-20.04'
Features: ['Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'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.24.2/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',

View File

@@ -2,12 +2,12 @@ Version: 2
Configurations:
-
Id: 'qnx-710-x86_64-developer-build-on-linux'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QNX_710'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-22.04'
Platform dependency: 'ubuntu-20.04'
Features: ['Packaging', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -17,12 +17,12 @@ Configurations:
]
-
Id: 'qnx-710-arm64-on-linux'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QNX_710'
Target arch: 'arm64'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-22.04'
Platform dependency: 'ubuntu-20.04'
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
@@ -30,12 +30,12 @@ Configurations:
]
-
Id: 'qnx-710-armv7-on-linux'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QNX_710'
Target arch: 'armv7'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-22.04'
Platform dependency: 'ubuntu-20.04'
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',

View File

@@ -17,9 +17,7 @@ Configurations:
Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Id: 'macos-11-minimal-static'

View File

@@ -14,7 +14,6 @@ Configurations:
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}}',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
@@ -32,11 +31,10 @@ Configurations:
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}}',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
Id: 'android-6-x86-on-linux'
Id: 'android-x86-on-linux'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
@@ -47,27 +45,26 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}}',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
'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}}'
]
-
Id: 'android-13-x86_64-on-linux'
Id: 'android-x86_64-on-linux'
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'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
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',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}}',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
'ANDROID_EMULATOR=@emulator_x86_64_api_33'
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]

View File

@@ -1,7 +1,20 @@
Version: 2
Configurations:
-
Id: 'webassembly-linux-thread-asyncify'
Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'opensuse-15.4-developer-build'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'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'
@@ -11,34 +24,3 @@ Configurations:
'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']
-
Id: 'webassembly-windows'
Template: 'qtci-windows-10_22H2-x86_64-50'
Target os: 'WebAssembly'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'windows-10_22h2-mingw11'
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',
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang',
]
-
Id: 'webassembly-macos-thread'
Template: 'qtci-macos-12-x86_64-105'
Target os: 'WebAssembly'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-universal-on-x86_64'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local',
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
]

View File

@@ -1,7 +1,7 @@
Version: 2
Configurations:
-
Id: 'ubuntu-22.04-license-check'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Id: 'ubuntu-20.04-license-check'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

View File

@@ -34,6 +34,6 @@ Configurations:
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

View File

@@ -2,13 +2,13 @@ Version: 2
Configurations:
-
Id: "integrity-arm64"
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Target os: 'INTEGRITY'
Platform dependency: 'ubuntu-22.04'
Platform dependency: 'ubuntu-20.04'
Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
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 -no-feature-brotli',
'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 -DQT_FEATURE_timezone=OFF',
'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',

View File

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

View File

@@ -17,7 +17,6 @@ Configurations:
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
]
@@ -29,13 +28,23 @@ Configurations:
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"',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
]
# Test on all supported macOS versions (deployment targets)
-
Id: 'macos-10.14-x86_64-tests'
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-10.15-x86_64-tests'
Template: 'qtci-macos-10.15-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-11-x86_64-tests'
Template: 'qtci-macos-11-x86_64-105'
@@ -93,8 +102,7 @@ Configurations:
Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
Environment variables: [
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
-
Id: 'macos-12-arm64-developer-build'
@@ -102,15 +110,23 @@ Configurations:
Compiler: 'Clang'
Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework'
Environment variables: [
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
]
# Note: We do not include OpenSSL or PostgreSQL in this build,
# as the M1 CI machines are not provisioned for that yet.
# Test on all supported macOS versions (deployment targets)
-
Id: 'macos-10.14-x86_64-developer-build-tests'
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-12-x86_64-developer-build'
-
Id: 'macos-10.15-x86_64-developer-build-tests'
Template: 'qtci-macos-10.15-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-12-x86_64-developer-build'
-
Id: 'macos-11-x86_64-developer-build-tests'
Template: 'qtci-macos-11-x86_64-105'

View File

@@ -2,42 +2,42 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET1'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET2'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET3'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET4'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET5'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET6'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET7'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET8'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET9'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET10'

View File

@@ -0,0 +1,71 @@
Version: 2
Include: [
cmake_platforms.yaml: [
Windows10_22H2-Mingw11-x64-host,
rhel-8.4
]
]
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-universal-on-x86_64'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -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_LATEST}}'
]
-
Template: 'qtci-windows-10_22H2-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_22H2-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_LATEST}} -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_LATEST}} -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_LATEST}}'
]
-
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'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -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_LATEST}}'
]
-
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'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -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_LATEST}}'
]

View File

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

View File

@@ -1,133 +0,0 @@
Version: 2
Configurations:
-
# cmake_platforms.yaml
Id: 'ubuntu-22.04-documentation'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'UseConfigure']
Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
-
Id: 'ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
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_platforms_qemu.yaml
Id: 'qemu-armv7-developer-build-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QEMU'
Target arch: 'armv7'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Features: ['Sccache']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
"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',
]
-
Id: 'qemu-arm64-developer-build-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Features: ['Sccache']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
"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',
]
-
Id: 'qemu-mips64-developer-build-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QEMU'
Target arch: 'mips64'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Features: ['Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
"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',
]
-
# cmake_platforms_qemu_qnx710.yaml
Id: 'qnx-710-x86_64-developer-build-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QNX_710'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-22.04'
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.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',
]
-
Id: 'qnx-710-arm64-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QNX_710'
Target arch: 'arm64'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-22.04'
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',
]
-
Id: 'qnx-710-armv7-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QNX_710'
Target arch: 'armv7'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-22.04'
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',
]
-
# default.yaml
Id: 'ubuntu-22.04-license-check'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
-
# integrity.yaml
Id: 'integrity-arm64-on-ubuntu-22.04-x86_64'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Target os: 'INTEGRITY'
Platform dependency: 'ubuntu-22.04'
Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
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 -no-feature-brotli',
'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',
'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',
'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH']

View File

@@ -1,22 +0,0 @@
Version: 2
Configurations:
-
# cmake_platforms.yaml
Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
-
Id: 'Ubuntu-22.04-xwayland-host'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
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'
]
-
# default.yaml
Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

View File

@@ -2,7 +2,7 @@ Version: 2
Module only: True
Include: [
cmake_platforms.yaml: [
"ubuntu-22.04",
"ubuntu-20.04",
"windows-10_22h2-msvc2019-developer-build",
"ios-universal"
],

View File

@@ -3,7 +3,7 @@ Module only: True
Include: [cmake_platforms.yaml]
Configurations:
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

View File

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

View File

@@ -22,18 +22,18 @@ Configurations:
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Qt5', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-macos-11-x86_64-106'
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['Packaging', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,32 +0,0 @@
Version: 2
Include: [
macos.yaml: [
"macos-universal-on-x86_64",
"macos-12-x86_64-tests",
"macos-12-arm-on-arm64-tests"
],
cmake_platforms.yaml: [
"ubuntu-22.04",
"ubuntu-22.04-documentation",
"opensuse-15.4-developer-build",
"sles-15_sp4-static",
"windows-10_22h2-msvc2019",
"windows-10_22h2-msvc2022",
"windows-10_22h2-msvc2019-developer-build",
"rhel-8.4",
"windows-10_22h2-mingw11",
"windows-10_22h2-mingw11-developer-build",
"windows-10_22h2-llvm",
"windows-11_22h2-msvc2019"
],
cmake_platforms_qemu_qnx710.yaml: [
"qnx-710-x86_64-developer-build-on-linux",
"qnx-710-arm64-on-linux",
"qnx-710-armv7-on-linux"
],
integrity.yaml: [
"integrity-arm64"
]
]
Configurations: []

View File

@@ -1,59 +1,24 @@
Version: 2
Include: [
macos.yaml: [
"macos-universal-on-x86_64",
"macos-12-x86_64-tests",
"macos-12-arm-on-arm64-tests"
],
cmake_platforms.yaml: [
"ubuntu-22.04",
"ubuntu-22.04-documentation",
"opensuse-15.4-developer-build",
"sles-15_sp4-static",
"windows-10_22h2-msvc2019",
"windows-10_22h2-msvc2022",
"rhel-8.4",
"windows-10_22h2-mingw11",
"windows-10_22h2-llvm",
"windows-11_22h2-msvc2019"
],
cmake_platforms_qemu_qnx710.yaml: [
"qnx-710-x86_64-developer-build-on-linux",
"qnx-710-arm64-on-linux",
"qnx-710-armv7-on-linux"
]
]
# Static build configurations for tools
Configurations:
-
Id: 'macos-latest-xcode-universal-static-build'
Template: 'qtci-macos-12-x86_64-105'
Target os: 'MacOS_12_Static'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-static -nomake examples -release -no-framework -no-icu -qt-doubleconversion -no-sql-mysql'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
]
-
Id: 'Linux-RHEL_8_4_Static'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'RHEL_8_4_Static'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
]
-
Id: 'Windows-MSVC2019_Static'
Template: 'qtci-windows-10_22H2-x86_64-50'
Target os: 'Windows_10_Static'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql -plugin-sql-sqlite -plugin-sql-odbc'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}']
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
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_22H2-x86_64-50'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
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: '-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-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
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,5 +1,3 @@
Version: 2
Include: [
cmake_platforms.yaml
]
Include: [cmake_platforms.yaml]
Configurations: []

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,18 +1,3 @@
Version: 2
Include: [
cmake_platforms.yaml
]
Configurations:
# Test on Ubuntu 22.04 Wayland
-
Id: 'ubuntu-22.04-documentation-wayland-tests'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
Platform dependency: 'ubuntu-22.04-documentation'
-
Id: 'ubuntu-22.04-wayland-tests'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
Platform dependency: 'ubuntu-22.04'
Include: [cmake_platforms.yaml]
Configurations: []

View File

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

View File

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

View File

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

View File

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

View File

@@ -2,12 +2,11 @@ Version: 2
Include: [ cmake_platforms_target_android.yaml ]
Configurations:
-
Id: 'automotive-ubuntu-22.04-documentation'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Id: 'automotive-ubuntu-20.04-documentation'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
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: 'windows-10_22h2-mingw11'
Template: 'qtci-windows-10_22H2-x86_64-50'

View File

@@ -3,7 +3,7 @@ Module only: True
Include: [cmake_platforms.yaml]
Configurations:
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

View File

@@ -1,51 +0,0 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2021 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
sudo tee -a /etc/dconf/db/local.d/00-media-automount <<"EOF"
[org/gnome/desktop/media-handling]
automount=false
automount-open=false
EOF
sudo dconf update

View File

@@ -1,58 +0,0 @@
### RHEL 9.0 ###
Hard Disk: 500G
Network: CI
Video Card: Total Video Memory: 64MB
Boot options/Firmware: BIOS
Language: English (United States)
Time & Date: Etc/Coordinated Universal Time
Software Selection: Server with GUI
Installation Destination: Automatic partitioning selected
Root Passowrd: Set
Network & Host..: Connect
Beging Installation
Reboot
# Configure Settings
Notifications:
* Lock Screen Notifications: OFF
* Applications: Set notificantion off
Applications:
* Disable notifications from all applications
Privacy:
* Blank Screen Delay: Never
* Screen Lock: OFF
Power:
* Blank screen: Never
Displays:
* Resolution: 1280 x 800
Users:
* Automatic login on
# Add user to sudoers
Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
sudo grub2-mkconfig -o /etc/grub2.cfg
sudo grub2-mkconfig -o /boot/grub2/grub.cfg
# Add support for virtio driver
su
echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf
dracut -f
# Enable network connection from right upper corner
# Fetch and run coin-setup
Download http://coin/coin/binary/linux_amd64/coin-setup
# run as qt user
run './coin-setup'
# Switch to use GNOME Classic user interface
# GNOME Classic was selected because there's an issue with Starndard (wayland display server). Autotest start failing because terminal session remains in Activities Overview.
# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3854
First execute script ./01-disable-automounting.sh (dconf update crash in GNOME Classic)
logout -> Select user (without it the drop down menu won't appear) -> switch to 'GNOME Classic' from drop down menu in login screen
Reboot

View File

@@ -62,13 +62,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"
toolsVersion="2.1"
toolsFile="commandlinetools-linux-6609375_latest.zip"
ndkVersionLatest="r25b"
ndkVersionDefault=$ndkVersionLatest
sdkBuildToolsVersion="33.0.1"
sdkApiLevel="android-33"
ndkVersionDefault="r23b"
sdkBuildToolsVersion="31.0.0"
sdkApiLevel="android-31"
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
ndkSha1Default=$ndkSha1Latest
ndkSha1Default="f47ec4c4badd11e9f593a8450180884a927c330d"
# Android automotive
sdkApiLevelAutomovie="android-30"
androidAutomotive11Url="$basePath/${sdkApiLevelAutomovie}_automotive.tar.gz"
@@ -155,9 +155,8 @@ echo "Android NDK = $ndkVersion" >> ~/versions.txt
cd "$sdkTargetFolder/cmdline-tools/tools/bin"
./sdkmanager --install "emulator" --sdk_root=$sdkTargetFolder \
| eval $sdkmanager_no_progress_bar_cmd
echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" | eval $sdkmanager_no_progress_bar_cmd
echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd
echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \
| eval $sdkmanager_no_progress_bar_cmd
echo "Checking the contents of Android SDK again..."
@@ -166,9 +165,6 @@ ls -l "$sdkTargetFolder"
echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -c 2048M -f \
-k "system-images;android-23;google_apis;x86"
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_33 -c 2048M -f \
-k "system-images;android-33;google_apis;x86_64"
echo "Install $sdkApiLevelAutomovie $androidAutomotive"
DownloadURL "$androidAutomotive11Url" "$androidAutomotive11Url" "$android11Sha" \
"/tmp/${sdkApiLevelAutomovie}_automotive.tar.gz"

View File

@@ -43,7 +43,7 @@ set -ex
echo "Disable Network Time Protocol (NTP)"
if uname -a |grep -q "Ubuntu\|Debian" ; then
if uname -a |grep -q "Ubuntu"; then
sudo timedatectl set-ntp false
elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then
(sudo systemctl stop chronyd && sudo systemctl disable chronyd)

View File

@@ -69,7 +69,7 @@ function InstallGCC() {
buildFolder="$HOME/gcc_build"
echo "Fetching prebuilt GCC."
DownloadURL "$prebuiltGCC" "" "$prebuiltSHA1" "$prebuiltTarget" || (
curl --fail -L --retry 5 --retry-delay 5 -o "$prebuiltTarget" "$prebuiltGCC" || (
echo "Fetching prebuilt GCC failed. Building from sources."
DownloadURL "$cachedUrl" "$officialUrl" "$sourcesSHA1" "$targetFile"
)

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#############################################################################
############################################################################
##
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
@@ -39,23 +39,39 @@
##
#############################################################################
# This script will build and install FFmpeg static libs
set -ex
echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf
sudo systemctl stop packagekit
sudo systemctl disable packagekit
sudo yum -y remove PackageKit gnome-software
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
sudo subscription-manager config --rhsm.manage_repos=1
sudo subscription-manager refresh
ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
sudo yum config-manager --enable 'codeready-builder-for-rhel-9-x86_64-rpms'
sudo yum config-manager --enable 'rhel-9-for-x86_64-baseos-rpms'
sudo yum config-manager --enable 'rhel-9-for-x86_64-appstream-rpms'
# Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
if [ -f /etc/redhat-release ]
then
sudo sudo yum -y install yasm
else
sudo apt install yasm
fi
sudo yum clean all
# As well as this fetching the repository data, we also get a printout of the used repos
sudo yum repolist
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

@@ -1,13 +1,3 @@
#!/usr/bin/env bash
installPackages+=(update-notifier)
if uname -a |grep -q "Ubuntu" ; then
installPackages+=(update-manager-core)
installPackages+=(update-manager)
installPackages+=(python3-distupgrade)
installPackages+=(python3-update-manager)
installPackages+=(ubuntu-release-upgrader-core)
fi
sudo apt -q -y remove "${installPackages[@]}"
sudo apt -q -y remove update-notifier update-manager python3-distupgrade python3-update-manager ubuntu-release-upgrader-core update-manager-core

View File

@@ -58,10 +58,10 @@ toolsVersion="2.1"
toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersionLatest="r25b"
ndkVersionDefault="$ndkVersionLatest"
sdkBuildToolsVersion="33.0.1"
ndkVersionDefault="r23b"
sdkBuildToolsVersion="31.0.0"
# this is compile sdk version
sdkApiLevel="android-33"
sdkApiLevel="android-31"
toolsSourceFile="$basePath/$toolsFile"

View File

@@ -61,14 +61,3 @@ DownloadURL $urlCache $urlOccifical $sha "/tmp/Docker_${chip}.dmg"
sudo hdiutil attach "/tmp/Docker_${chip}.dmg"
sudo /Volumes/Docker/Docker.app/Contents/MacOS/install --accept-license --user qt
sudo hdiutil detach /Volumes/Docker
# Add registry mirror for docker images
mkdir "$HOME/.docker"
sudo tee -a $HOME/.docker/daemon.json <<"EOF"
{
"builder": { "gc": { "defaultKeepStorage": "20GB", "enabled": true } },
"experimental": false,
"features": { "buildkit": true },
"registry-mirrors": ["http://repo-clones.ci.qt.io:5000"]
}
EOF

View File

@@ -47,25 +47,3 @@ brew install libusb
read -r -a arr <<< $(brew list --versions libusb)
version=${arr[1]}
echo "libusb = $version" >> ~/versions.txt
mkdir /tmp/arm64/
mkdir /tmp/amd64/
case $(sw_vers -productVersion) in
11*) codename=big_sur;;
12*) codename=monterey;;
13*) codename=ventura;;
esac
brew fetch --bottle-tag=arm64_${codename} libusb
brew fetch --bottle-tag=${codename} libusb
tar xf $(brew --cache --bottle-tag=arm64_${codename} libusb) -C /tmp/arm64/
tar xf $(brew --cache --bottle-tag=${codename} libusb) -C /tmp/amd64
for f in /tmp/arm64/libusb/$version/lib/* ; do
if lipo -info $f >/dev/null 2>&1; then
file=$(basename $f)
lipo -create -output $(brew --cellar)/libusb/$version/lib/$file \
/tmp/arm64/libusb/$version/lib/$file \
/tmp/amd64/libusb/$version/lib/$file
fi
done

View File

@@ -1 +1 @@
--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic
--disable-programs --disable-doc --disable-debug --disable-network --disable-lzma --enable-pic

View File

@@ -50,12 +50,7 @@ function SetEnvVar {
echo "Setting environment variable $name to $path."
if uname -a |grep -q "Ubuntu"; then
if lsb_release -a |grep "Ubuntu 22.04"; then
echo "export $name=$path" >> ~/.bashrc
echo "export $name=$path" >> ~/.bash_profile
else
echo "export $name=$path" >> ~/.profile
fi
echo "export $name=$path" >> ~/.profile
else
echo "export $name=$path" >> ~/.bashrc
echo "export $name=$path" >> ~/.zshrc

View File

@@ -41,7 +41,7 @@
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
version="3.1.25"
version="3.1.14"
versionNode="v14.18.2"
mkdir -p /opt

View File

@@ -1,139 +0,0 @@
#!/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
os="$1"
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="n6.0"
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
sha1="78435ec71cc2227017a99c030e858719b8c7c74d"
url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz"
ffmpeg_name="FFmpeg-$version"
target_dir="$HOME"
app_prefix=""
ffmpeg_source_dir="$target_dir/$ffmpeg_name"
if [ ! -d "$ffmpeg_source_dir" ];
then
InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix"
fi
build_ffmpeg_android() {
target_arch=$1
target_dir=$2
sudo mkdir -p "$target_dir"
if [ "$target_arch" == "x86_64" ]; then
target_toolchain_arch="x86_64-linux-android"
target_arch=x86_64
target_cpu=x86_64
elif [ "$target_arch" == "x86" ]; then
target_toolchain_arch="i686-linux-android"
target_arch=x86
target_cpu=i686
elif [ "$target_arch" == "arm64" ]; then
target_toolchain_arch="aarch64-linux-android"
target_arch=aarch64
target_cpu=armv8-a
fi
api_version=24
ndk_root=/opt/android/android-ndk-r25b
if uname -a |grep -q "Darwin"; then
ndk_host=darwin-x86_64
else
ndk_host=linux-x86_64
fi
toolchain=${ndk_root}/toolchains/llvm/prebuilt/${ndk_host}
toolchain_bin=${toolchain}/bin
sysroot=${toolchain}/sysroot
cxx=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++
cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang
ld=${toolchain_bin}/ld
ar=${toolchain_bin}/llvm-ar
ranlib=${toolchain_bin}/llvm-ranlib
nm=${toolchain_bin}/llvm-nm
strip=${toolchain_bin}/llvm-strip
ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
ffmpeg_config_options+=" --disable-vulkan --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
local build_dir="$ffmpeg_source_dir/build/$target_arch"
sudo mkdir -p "$build_dir"
pushd "$build_dir"
sudo $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="$target_dir"
sudo make install -j4
popd
}
if [ "$os" == "android-x86" ]; then
target_arch=x86
target_dir="/usr/local/android/ffmpeg-x86"
SetEnvVar "FFMPEG_DIR_ANDROID_X86" "$target_dir"
elif [ "$os" == "android-x86_64" ]; then
target_arch=x86_64
target_dir="/usr/local/android/ffmpeg-x86_64"
SetEnvVar "FFMPEG_DIR_ANDROID_X86_64" "$target_dir"
elif [ "$os" == "android-arm64" ]; then
target_arch=arm64
target_dir="/usr/local/android/ffmpeg-arm64"
SetEnvVar "FFMPEG_DIR_ANDROID_ARM64" "$target_dir"
fi
build_ffmpeg_android "$target_arch" "$target_dir"

View File

@@ -48,9 +48,31 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="n6.0"
function SourceEnvVar {
echo "Source environment variables file"
if [ uname -a | grep -q "Ubuntu" ];
then
if [ lsb_release -a | grep "Ubuntu 22.04" ];
then source ~/.bashrc
else source ~/.profile
fi
else
source ~/.bashrc
source ~/.zshrc
fi
}
if [ "$os" == "android" ];
then
version="f0d2ed135c3602670b56a95e0346487730317407"
url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
sha1="a429060d07b6d84c849a68741f816a7e91447d12"
else
version="n5.1"
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
sha1="78435ec71cc2227017a99c030e858719b8c7c74d"
sha1="1d4283c5ff9e02378893168f55b8672bb30b9176"
fi
url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz"
ffmpeg_name="FFmpeg-$version"
@@ -77,7 +99,8 @@ build_ffmpeg() {
then prefix="/usr/local/$ffmpeg_name"
fi
if [ -n "$arch" ]
# android configures its own toolchain, it does not use the system clang
if [ -n "$arch" ] && [ "$os" != "android" ]
then cc="clang -arch $arch"
fi
@@ -89,26 +112,94 @@ build_ffmpeg() {
popd
}
build_ffmpeg_android() {
SourceEnvVar
target_arch=$1
target_dir=$2
if [ "$target_arch" == "x86_64" ];
then
#emulador on CI is x86_64
target_toolchain_arch="x86_64-linux-android"
target_arch=x86_64
target_cpu=x86_64
else
#emulador on CI is x86
target_toolchain_arch="i686-linux-android"
target_arch=x86
target_cpu=i686
fi
api_version=24
toolchain=${ANDROID_NDK_ROOT_DEFAULT}/toolchains/llvm/prebuilt/${ANDROID_NDK_HOST}
toolchain_bin=${toolchain}/bin
sysroot=${toolchain}/sysroot
cxx=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++
cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang
ffmpeg_config_options+=" --disable-vulkan --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --cpu=${target_cpu} --disable-indev=android_camera --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/ --cc=${cc} --cxx=${cxx}"
build_ffmpeg ${target_arch} ${target_dir}
}
if [ "$os" == "linux" ]; then
if [ -f /etc/redhat-release ]
then sudo yum -y install yasm
else sudo apt install yasm
fi
build_ffmpeg
sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
elif [ "$os" == "macos" ]; then
brew install yasm
export MACOSX_DEPLOYMENT_TARGET=11
export MACOSX_DEPLOYMENT_TARGET=10.14
build_ffmpeg
sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
elif [ "$os" == "macos-universal" ]; then
brew install yasm
export MACOSX_DEPLOYMENT_TARGET=11
export MACOSX_DEPLOYMENT_TARGET=10.14
build_ffmpeg "arm64"
build_ffmpeg "x86_64"
sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$ffmpeg_source_dir/build/arm64/installed" "$ffmpeg_source_dir/build/x86_64/installed"
SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
elif [ "$os" == "android" ]; then
SourceEnvVar
url_cached=""
url_public=""
sha1=""
#get emulator target arch
if [ "$ANDROID_EMULATOR" == *"x86_64"* ];
then
target_arch=x86_64
sha1="0241fd483c16f4ce53206b911214b06854cdef9d"
url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86_64.zip"
target_dir="/opt/android/$ffmpeg_name/ffmpeg-x86_64"
else
target_arch=x86
url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86.zip"
sha1="8b254e31411a350edb581bb30e31401866abbe7d"
target_dir="/opt/android/$ffmpeg_name/ffmpeg-x86"
fi
app_prefix=""
#try install a pre-build
InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix"
#if could not install pre-build, build it
if [ ! -d "$target_dir" ];
then build_ffmpeg_android "$target_arch" "$target_dir"
fi
#set the var to use in yaml
SetEnvVar "FFMPEG_DIR_ANDROID" "$target_dir"
fi

View File

@@ -48,11 +48,11 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="3.0.7"
version="1.1.1m"
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
targetFile="/tmp/openssl-$version.tar.gz"
sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
sha="39d424c4411e45f1570073d7a71b1830b96007ca"
opensslHome="${HOME}/openssl-${version}"
opensslSource="${opensslHome}-src"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
@@ -62,14 +62,14 @@ cd "$opensslSource"
pwd
if [[ "$os" == "linux" ]]; then
./Configure --prefix="$opensslHome" shared enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack"
./Configure --prefix="$opensslHome" shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack"
make && make install_sw install_ssldirs
SetEnvVar "OPENSSL_HOME" "$opensslHome"
SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\""
if uname -a |grep -q "Ubuntu"; then
echo "export LD_LIBRARY_PATH=$opensslHome/lib64:$LD_LIBRARY_PATH" >> ~/.bash_profile
echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bash_profile
else
echo "export LD_LIBRARY_PATH=$opensslHome/lib64:$LD_LIBRARY_PATH" >> ~/.bashrc
echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bashrc
fi
elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
@@ -84,7 +84,7 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
commonFlags="no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 -Wa,--noexecstack"
export MACOSX_DEPLOYMENT_TARGET=11
export MACOSX_DEPLOYMENT_TARGET=10.14
opensslBuild="${opensslHome}-build"
opensslDestdir="${opensslHome}-destdir"

View File

@@ -1,109 +0,0 @@
#!/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 installs gRPC from sources.
set -ex
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# Extract cmake path from the environment
if uname -a |grep -q "Ubuntu"; then
if lsb_release -a |grep "Ubuntu 22.04"; then
source ~/.bash_profile
else
source ~/.profile
fi
else
source ~/.bashrc
fi
version="1.50.1"
sha1="be1b0c3dbfbc9714824921f50dffb7cf044da5ab"
internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/grpc-all-$version.zip"
externalUrl=""
installPrefix="$HOME/install-grpc-$version"
targetDir="$HOME/grpc-$version"
targetFile="$targetDir.zip"
DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
unzip -q "$targetFile" -d "$HOME"
sudo rm "$targetFile"
# devtoolset is needed when running configuration
if uname -a |grep -qv "Darwin"; then
export PATH="/opt/rh/devtoolset-7/root/usr/bin:$PATH"
fi
if uname -a |grep -q Darwin; then
extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11"
SetEnvVar PATH "\$PATH:$installPrefix/bin"
fi
# MacOS
if [[ -n "$OPENSSL_DIR" ]]; then
extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR
# Linux
elif [[ -n "$OPENSSL_HOME" ]]; then
extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_HOME
fi
echo "Configuring and building gRPC"
buildDir="$HOME/build-grpc-$version"
mkdir -p "$buildDir"
cd "$buildDir"
cmake $targetDir -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug;RelWithDebugInfo" -DCMAKE_INSTALL_PREFIX=$installPrefix $extraCMakeArgs $extraOpenSslArg -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER="package" -DgRPC_SSL_PROVIDER="package" -DgRPC_ZLIB_PROVIDER="package"
ninja all
sudo env "PATH=$PATH" ninja install
# Refresh shared library cache if OS isn't macOS
if uname -a |grep -qv "Darwin"; then
sudo ldconfig
fi
SetEnvVar "gRPC_ROOT" "$installPrefix"
SetEnvVar "absl_ROOT" "$installPrefix"
sudo rm -rf "$targetDir"
sudo rm -rf "$buildDir"

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2022 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -44,21 +44,10 @@ source "${BASH_SOURCE%/*}/DownloadURL.sh"
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# Extract cmake path from the environment
if uname -a |grep -q "Ubuntu"; then
if lsb_release -a |grep "Ubuntu 22.04"; then
source ~/.bash_profile
else
source ~/.profile
fi
else
source ~/.bashrc
fi
# This script will install Google's Protocal Buffers which is needed by Automotive Suite
# This script will install Google's Protocal Buffers
version="21.9"
sha1="3226a0e49d048759b702ae524da79387c59f05cc"
version="3.6.1"
sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
@@ -74,19 +63,15 @@ if uname -a |grep -qv "Darwin"; then
fi
echo "Configuring and building protobuf"
installPrefix="/usr/local"
cd "$targetDir"
if uname -a |grep -q Darwin; then
extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11"
SetEnvVar PATH "\$PATH:$installPrefix/bin"
./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local"
SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin"
else
./configure
fi
buildDir="$HOME/build-protobuf-$version"
mkdir "$buildDir"
cd "$buildDir"
cmake $targetDir -G"Ninja Multi-Config" -DCMAKE_INSTALL_PREFIX=$installPrefix $extraCMakeArgs -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_EXAMPLES=OFF -Dprotobuf_BUILD_PROTOC_BINARIES=ON -DBUILD_SHARED_LIBS=OFF -Dprotobuf_WITH_ZLIB=OFF -DCMAKE_CONFIGURATION_TYPES="Release;Debug;RelWithDebugInfo" -DCMAKE_CROSS_CONFIGS=all -DCMAKE_DEFAULT_CONFIGS=all
ninja all:all
sudo env "PATH=$PATH" ninja install:all
make -j5
sudo make install
# Refresh shared library cache if OS isn't macOS
if uname -a |grep -qv "Darwin"; then
@@ -94,4 +79,3 @@ if uname -a |grep -qv "Darwin"; then
fi
sudo rm -r "$targetDir"
sudo rm -r "$buildDir"

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2022 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -53,9 +53,6 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
PROVISIONING_DIR="$(dirname "$0")/../../"
. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
libclang_version="15.0.0"
if uname -a |grep -q Darwin; then
@@ -65,14 +62,9 @@ if uname -a |grep -q Darwin; then
sha1="6d916a17459c81551dde47580ae3f071e93338a5"
elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat" | grep -v "8" ; then
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
sha1="6ca035bb522022d34d61759e0460845832933b5c"
elif [ "$PROVISIONING_OS_ID" = ubuntu ]; then
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-CentOS8.3-gcc9.2-x86_64.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-CentOS8.3-gcc9.2-x86_64.7z"
sha1="d02e4dd30fe3f810c3a0cdcbed5870dec56ed91b"
else
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"

View File

@@ -1,123 +0,0 @@
#!/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 prebuilt OpenSSL which was built against Android NDK 25.
# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
set -ex
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="3.0.7"
ndkVersionLatest="r25b"
ndkVersionDefault=$ndkVersionLatest
prebuiltOpensslNdkShaDarwinLatest="5cf5ef6c19e62954ccffcd1e31ac1f331028de0d"
prebuiltOpensslNdkShaLinuxLatest="f5e7e840dc1fac2868033ecfc0eeb79742b0daff"
prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest
prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest
: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 25
# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
exports_file="/tmp/export.sh"
# source previously made environmental variables.
if uname -a |grep -q "Ubuntu"; then
# shellcheck disable=SC1090
grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
rm -rf "$exports_file"
else
# shellcheck disable=SC1090
grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
rm -rf "$exports_file"
fi
# ANDROID_NDK_ROOT is required during Configure
export ANDROID_NDK_ROOT=/opt/android/android-ndk-r25b
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
targetFile="/tmp/openssl-$version.tar.gz"
sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
opensslHome="${HOME}/openssl/android/openssl-${version}"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
mkdir -p "${HOME}/openssl/android/"
tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
if uname -a |grep -q "Darwin"; then
TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin
else
TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
fi
cd "$opensslHome"
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
'
function InstallPrebuiltOpenssl() {
ndkVersion=$1
nkdSha=$2
os=$3
if [[ ! -d ${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version} ]]; then
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}-${os}.tar.gz"
targetFile="/tmp/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}-${os}.tar.gz"
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$nkdSha" "$targetFile"
tar -xzf "$targetFile" -C "${HOME}"
opensslHome="${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version}"
sudo rm -f $targetFile
fi
}
if uname -a |grep -q "Darwin"; then
InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaDarwinDefault "darwin"
SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaDarwinLatest "darwin"
SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
else
InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaLinuxDefault "linux"
SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaLinuxLatest "linux"
SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
fi
echo "OpenSSL for Android = $version" >> ~/versions.txt

View File

@@ -39,7 +39,7 @@
##
#############################################################################
# This script install prebuilt OpenSSL which was built against Android NDK 25.
# This script install prebuilt OpenSSL which was built against Android NDK 21.
# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
set -ex
@@ -48,16 +48,16 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="3.0.7"
version="1.1.1m"
ndkVersionLatest="r25b"
ndkVersionDefault=$ndkVersionLatest
prebuiltOpensslNdkShaDarwinLatest="5cf5ef6c19e62954ccffcd1e31ac1f331028de0d"
prebuiltOpensslNdkShaLinuxLatest="f5e7e840dc1fac2868033ecfc0eeb79742b0daff"
prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest
prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest
ndkVersionDefault="r23b"
prebuiltOpensslNdkShaDarwinLatest="1f4f994255c39839c8857d2ed1ff58a2101de714"
prebuiltOpensslNdkShaLinuxLatest="15f7014781186a23f4973a719b55b766b1e69116"
prebuiltOpensslNdkShaDarwinDefault="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
prebuiltOpensslNdkShaLinuxDefault="f58dcb32b2d3e5edc7e5141ae139a50547805f60"
: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 25
# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
# Source built requires GCC and Perl to be in PATH.
exports_file="/tmp/export.sh"
# source previously made environmental variables.
if uname -a |grep -q "Ubuntu"; then
@@ -70,13 +70,10 @@ else
rm -rf "$exports_file"
fi
# ANDROID_NDK_ROOT is required during Configure
export ANDROID_NDK_ROOT=/opt/android/android-ndk-r25b
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
targetFile="/tmp/openssl-$version.tar.gz"
sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
sha="39d424c4411e45f1570073d7a71b1830b96007ca"
opensslHome="${HOME}/openssl/android/openssl-${version}"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
mkdir -p "${HOME}/openssl/android/"
@@ -103,6 +100,7 @@ function InstallPrebuiltOpenssl() {
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$nkdSha" "$targetFile"
tar -xzf "$targetFile" -C "${HOME}"
mv "${HOME}/openssl" "${HOME}/openssl_android_ndk_${ndkVersion}"
opensslHome="${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version}"
sudo rm -f $targetFile
fi

View File

@@ -62,11 +62,4 @@ function installSccache {
# disable sccache server from shutting down after being idle
SetEnvVar "SCCACHE_IDLE_TIMEOUT" "0"
# copy sccache wrapper and place as a first in PATH
mkdir -p $HOME/sccache_wrapper
cp ${BASH_SOURCE%/*}/sccache_wrapper $HOME/sccache_wrapper/sccache
chmod 755 $HOME/sccache_wrapper/sccache
SetEnvVar "PATH" "$HOME/sccache_wrapper:\$PATH"
}

View File

@@ -1,14 +0,0 @@
#!/usr/bin/env bash
# Call real sccache with original arguments
# sccache /opt/android/android-ndk-r23b/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=aarch64-none ......
real_sccache=/usr/local/sccache/sccache
$real_sccache "$@"
retval=$?
if test $retval -ne 0
then
echo "Sccache command failed, re-try calling build tool directly"
"$@"
retval=$?
fi
exit $retval

View File

@@ -51,13 +51,13 @@ if (Is64BitWinHost) {
# Msys need to be installed to target machine
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
$openssl_version = "3.0.7"
$openssl_version = "1.1.1m"
$ndk_version_latest = "r25b"
$ndk_version_default = "$ndk_version_latest"
$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}.tar.gz")
$openssl_sha1 = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
$prebuilt_sha1_ndk_latest = "d4348812054a88b5b672a8ceae62bf30c564869b"
$prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest"
$ndk_version_default = "r23b"
$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}_fixes-ndk_root.tar.gz")
$openssl_sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
$prebuilt_sha1_ndk_latest = "2897c84dccdb26e15b467e4a63de025fe7038899"
$prebuilt_sha1_ndk_default = "0aebe55d2436f235e1a24ae9d1030cb6ce8f31da"
$destination = "C:\Utils\openssl-android-master"
function Install($1, $2) {
@@ -81,16 +81,16 @@ function Install($1, $2) {
} else {
Write-Host "Build OpenSSL for Android from sources"
# openssl-${openssl_version}_fixes-ndk_root.tar.gz package includes fixes from https://github.com/openssl/openssl/pull/17322 and string ANDROID_NDK_HOME is replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf
Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}.tar.gz $openssl_compressed
Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}_fixes-ndk_root.tar.gz $openssl_compressed
Verify-Checksum $openssl_compressed $openssl_sha1
Extract-7Zip $openssl_compressed C:\Utils\tmp
Extract-7Zip C:\Utils\tmp\openssl-${openssl_version}.tar C:\Utils\tmp
Move-Item C:\Utils\tmp\openssl-${openssl_version} ${destination}-${ndk_version}
Extract-7Zip C:\Utils\tmp\openssl-${openssl_version}_fixes-ndk_root.tar C:\Utils\tmp
Move-Item C:\Utils\tmp\openssl-${openssl_version} $destination
Remove "$openssl_compressed"
Write-Host "Configuring OpenSSL $openssl_version for Android..."
Push-Location ${destination}-${ndk_version}
Push-Location $destination
# $ must be escaped in powershell...
function CheckExitCode {
@@ -105,12 +105,6 @@ function Install($1, $2) {
}
}
# ANDROID_NDK_ROOT needs to be in environment variables before running this script
# Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r25b"
$make_install = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"yes | pacman -S make`"")
CheckExitCode $make_install
$configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
CheckExitCode $configure
@@ -121,6 +115,7 @@ function Install($1, $2) {
Remove-item C:\Utils\tmp -Recurse -Confirm:$false
}
Move-Item $destination "${destination}-${ndk_version}"
}
# Install NDK Default version

View File

@@ -47,9 +47,9 @@
# NDK
$ndkVersionLatest = "r25b"
$ndkVersionDefault = $ndkVersionLatest
$ndkVersionDefault = "r23b"
$ndkChecksumLatest = "b2e9b5ab2e1434a65ffd85780891878cf5c6fd92"
$ndkChecksumDefault = $ndkChecksumLatest
$ndkChecksumDefault = "6e3fb50022c611a2b13d02f5de5c21cc7206a298"
$ndkCachedUrlLatest = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersionLatest-windows.zip"
$ndkOfficialUrlLatest = "https://dl.google.com/android/repository/android-ndk-$ndkVersionLatest-windows.zip"
$ndkCachedUrlDefault = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersionDefault-windows.zip"
@@ -62,8 +62,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk.zip"
$toolsVersion = "2.1"
$toolsFile = "commandlinetools-win-6609375_latest.zip"
$sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-33"
$sdkBuildToolsVersion = "33.0.1"
$sdkApiLevel = "android-31"
$sdkBuildToolsVersion = "31.0.0"
$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"

View File

@@ -41,7 +41,7 @@
# This script will install emscripten needed by WebAssembly
$version = "3.1.25"
$version = "3.1.14"
# Make sure python is in the path
Prepend-Path "C:\Python27"

View File

@@ -1,155 +0,0 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
. "$PSScriptRoot\helpers.ps1"
# Here we build gRPC libraries for MinGW and MSVC.
# Since it's a c++ library we need both msvc and mingw because they mangle symbols differently.
# For MSVC it builds with both debug and release configurations because of the visual c++ runtime.
# For MinGW we only need one, so we only build with release.
# The function below takes care of the common part of building - invoking cmake,
# calling ninja and installing it to a directory which we set an environment variable to.
# Because we have two compilers we also have two env. vars. and then each
# config in CI has the gRPC_ROOT set to the appropriate one.
function build-install-grpc {
param(
[string]$CC,
[string]$CXX,
[string]$BuildType,
[string]$Postfix # Used for install-path and the environment variable name
)
$installPrefix = "C:\Utils\grpc"
$installPath = "${installPrefix}-$Postfix"
Write-Output "Configuring and building gRPC for $CXX"
$oldCC = $env:CC
$oldCXX = $env:CXX
$env:CC = $CC
$env:CXX = $CXX
$Protobuf_ROOT="C:\Utils\protobuf-$Postfix"
if (!(Test-Path $Protobuf_ROOT -ErrorAction SilentlyContinue)) {
throw "Protobuf is missing, expected at `"$Protobuf_ROOT`"."
}
$OPENSSL_ROOT_DIR="C:\openssl"
if (!(Test-Path $OPENSSL_ROOT_DIR -ErrorAction SilentlyContinue)) {
throw "OpenSSL is missing, expected at `"$OPENSSL_ROOT_DIR`"."
}
Remove build-grpc
mkdir build-grpc
Push-Location build-grpc
$configureOptions = @(
# plugins
"-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF"
"-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF"
"-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF"
"-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF"
"-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF"
"-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF"
# extensions
"-DgRPC_BUILD_CSHARP_EXT=OFF"
# general
"-DgRPC_BUILD_TESTS=OFF"
"-DgRPC_PROTOBUF_PROVIDER=`"package`""
"-DgRPC_SSL_PROVIDER=`"package`""
"-DOPENSSL_ROOT_DIR=`"$OPENSSL_ROOT_DIR`""
# protobuf
"-DProtobuf_USE_STATIC_LIBS=ON"
"-DProtobuf_ROOT=`"$Protobuf_ROOT`""
)
cmake .. -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="$BuildType" -DCMAKE_INSTALL_PREFIX="$installPath" $extraCMakeArgs $configureOptions
$result = $LASTEXITCODE
if ($result -eq 0) {
# ninja install:all # This is broken and does not work
foreach ($config in $BuildType.split(";")) {
ninja -f "build-$config.ninja" install
}
$result = $LASTEXITCODE
}
$env:CC = $oldCC
$env:CXX = $oldCXX
Set-EnvironmentVariable "gRPC_ROOT_$Postfix" "$InstallPath"
Pop-Location
Remove build-grpc
if ($result -ne 0) {
throw "Build exited with $result"
}
}
# Ensures a tool is in path or adds it to path if the $Path supplied to it
# contains it. Will throw if it's not found at all
function Find-Tool {
param(
[string]$Name,
[string]$Path
)
# Is tool missing from path?
if (!(Get-Command $Name -ErrorAction SilentlyContinue)) {
# Is tool in the $Path directory?
if (Test-Path "$Path\$Name" -ErrorAction SilentlyContinue) {
$env:Path += ";$Path"
}
else {
throw "Cannot find $Name in path or $Name in $Path, something is configured wrong"
}
}
}
# This script is fairly late in provisioning so both of these should be present!
Find-Tool -Name "cmake.exe" -Path "C:\CMake\bin"
Find-Tool -Name "ninja.exe" -Path "C:\Utils\Ninja"
$version="1.50.1"
$sha1="be1b0c3dbfbc9714824921f50dffb7cf044da5ab"
$internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/grpc-all-$version.zip"
$externalUrl=""
$basedir = "$env:HOMEDRIVE\$env:HOMEPATH\grpc"
mkdir $basedir
$targetDir = "$basedir\grpc-$version"
$targetFile = "$targetDir.zip"
Download $externalUrl $internalUrl $targetFile
Verify-Checksum $targetFile $sha1
Extract-7Zip $targetFile $basedir
Remove $targetFile
Push-Location $basedir
# Create a new top-level CMakeLists.txt file so we can set a modern policy
# for find_package calls
Write-Output "cmake_minimum_required(VERSION 3.5.1)`nproject(grpc LANGUAGES C CXX)`ncmake_policy(SET CMP0074 NEW)`nadd_subdirectory(grpc-$version)" | Out-File CMakeLists.txt -Encoding utf8
### MinGW
# Check if mingw is where we expect it to be and add it to path:
$mingwPath = "C:\MINGW1120\mingw64\bin"
if (!(Test-Path $mingwPath)) {
throw "Cannot find mingw in $mingwPath, something is configured wrong"
}
$oldPath = $env:Path
$env:Path = "$mingwPath;$env:Path"
build-install-grpc -CC "gcc" -CXX "g++" -BuildType "Release" -Postfix "mingw"
$env:Path = $oldPath
### LLVM MinGW
# $llvmMingwPath = "C:\llvm-mingw"
# if (!(Test-Path $llvmMingwPath)) {
# throw "Cannot find llvm-mingw in $llvmMingwPath, something is configured wrong"
# }
$oldPath = $env:Path
$env:Path = "$llvmMingwPath\bin;$env:Path"
# build-install-grpc -CC "clang" -CXX "clang++" -BuildType "Release" -Postfix "llvm_mingw"
$env:Path = $oldPath
### MSVC
EnterVSDevShell
build-install-grpc -CC "cl" -CXX "cl" -BuildType "Release" -Postfix "msvc"
$env:Path = $oldPath
Pop-Location
Remove $basedir
Write-Output "gRPC = $version" >> ~/versions.txt

View File

@@ -274,35 +274,3 @@ function DeleteSchedulerTask {
Write-Host "Disabling $Task from Task Scheduler"
SCHTASKS /DELETE /TN "Microsoft\Windows\$Task" /F
}
function GetVSPath {
Param (
[string]$VSWhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe",
[string]$Component = "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
)
return (& $VSWhere -nologo -latest -products * -requires $Component -property installationPath)
}
function EnterVSDevShell {
# Add cl to path if it is not already there.
if (Get-Command cl.exe -ErrorAction SilentlyContinue) {
return $true
}
$vsWere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
$vcComponent = "Microsoft.VisualStudio.Component.VC.CoreIde"
# We pick the oldest build tools we can find and use that to be compatible with it and any newer version:
# If MSVC has an ABI break this will stop working, and yet another build must be added.
$VSPath = (& $vsWere -nologo -products * -requires $vcComponent -sort -format value -property installationPath | Select-Object -Last 1)
Write-Host "Enter VisualStudio developer shell"
try {
Import-Module "$VSPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
Enter-VsDevShell -VsInstallPath $VSPath -DevCmdArguments "-arch=x64 -no_logo"
} catch {
Write-Host "Failed to enter VisualStudio DevShell"
return $false
}
return $true
}

View File

@@ -42,9 +42,9 @@
# This script will install FFmpeg
$msys = "C:\Utils\msys64\usr\bin\bash"
$version = "n6.0"
$version = "n5.1"
$ffmpeg_name = "ffmpeg-" + $version;
$sha1 = "5DDDE739FF966A7EEE810D65D7290860A52709D7"
$sha1 = "9D5AD63032B03922D38F99159728F24C305FC345"
$url_cached = "http://ci-files01-hki.intra.qt.io/input/ffmpeg/" + $version + ".zip"
$url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"
@@ -107,8 +107,15 @@ function InstallMingwFfmpeg {
function InstallMsvcFfmpeg {
$result = EnterVSDevShell
if (-Not $result) {
$vsPath = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional"
#$vsPath = "C:\Program Files\Microsoft Visual Studio\2022\Professional"
Write-Host "Enter VisualStudio developer shell"
try {
Import-Module "$vsPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
Enter-VsDevShell -VsInstallPath $vsPath -DevCmdArguments "-arch=x64 -no_logo"
} catch {
Write-Host "Failed to enter VisualStudio DevShell"
return $false
}
@@ -134,44 +141,13 @@ function InstallLlvmMingwFfmpeg {
return InstallFfmpeg -buildSystem "llvm-mingw" -msystem "CLANG64" -ffmpegDirEnvVar "FFMPEG_DIR_LLVM_MINGW" -additionalPath "C:\llvm-mingw\bin"
}
function InstallAndroidArmv7 {
$target_toolchain_arch="armv7a-linux-androideabi"
$target_arch="armv7-a"
$target_cpu="armv7-a"
$api_version="24"
$ndkVersionLatest = "r25b"
$ndkFolderLatest = "/c/Utils/Android/android-ndk-$ndkVersionLatest"
$toolchain="${ndkFolderLatest}/toolchains/llvm/prebuilt/windows-x86_64"
$toolchain_bin="${toolchain}/bin"
$sysroot="${toolchain}/sysroot"
$cxx="${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++"
$cc="${toolchain_bin}/${target_toolchain_arch}${api_version}-clang"
$ld="${toolchain_bin}/ld.exe"
$ar="${toolchain_bin}/llvm-ar.exe"
$ranlib="${toolchain_bin}/llvm-ranlib.exe"
$nm="${toolchain_bin}/llvm-nm.exe"
$strip="${toolchain_bin}/llvm-strip.exe"
$config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"
$config += " --disable-vulkan --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
$config += " --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
$config += " --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
return InstallFfmpeg -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar "FFMPEG_DIR_ANDROID_ARMV7"
}
$mingwRes = InstallMingwFfmpeg
$msvcRes = InstallMsvcFfmpeg
$llvmMingwRes = InstallLlvmMingwFfmpeg
$androidArmV7Res = InstallAndroidArmv7
Write-Host "Ffmpeg installation results:"
Write-Host " mingw:" $(if ($mingwRes) { "OK" } else { "FAIL" })
Write-Host " msvc:" $(if ($msvcRes) { "OK" } else { "FAIL" })
Write-Host " llvm-mingw:" $(if ($llvmMingwRes) { "OK" } else { "FAIL" })
Write-Host " android-armv7:" $(if ($androidArmV7Res) { "OK" } else { "FAIL" })
exit $(if ($mingwRes -and $msvcRes -and $llvmMingwRes -and $androidArmV7Res) { 0 } else { 1 })
exit $(if ($mingwRes -and $msvcRes -and $llvmMingwRes) { 0 } else { 1 })

View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2023 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,37 +42,48 @@
# This script installs MySQL $version.
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
$version = "6.1.11"
$installFolder = "C:\Utils"
$officialUrl = "https://downloads.mysql.com/archives/get/p/19/file/mysql-connector-c-${version}-winx64.zip"
$officialUrlDebug = "https://downloads.mysql.com/archives/get/p/19/file/mysql-connector-${version}-winx64-debug.zip"
$cacheURl = "http://ci-files01-hki.ci.qt.io/input/windows/mysql-connector-c-${version}-winx64.zip"
$cacheURlDebug = "http://ci-files01-hki.ci.qt.io/input/windows/mysql-connector-c-${version}-winx64-debug.zip"
$sha = "93e22a1ba3944a6c8e01d3ea04c1bfb005b238f9"
$shaDebug = "d54088a9182e2f03b4d6f44c327e341eeab16367"
$zip = Get-DownloadLocation ("mysql-connector-c-" + $version + "-winx64.zip")
$zipDebug = Get-DownloadLocation ("mysql-connector-c-" + $version + "-winx64-debug.zip")
$version = "5.7.25"
$baseNameX64 = "mysql-$version-winx64"
$packagex64 = "C:\Windows\temp\$baseNameX64.zip"
$baseNameX86 = "mysql-$version-win32"
$packagex86 = "C:\Windows\temp\$baseNameX86.zip"
$installFolder = "C:\Utils\my_sql"
function Install {
param(
[string]$officialUrl,
[string]$cacheUrl,
[string]$zip,
[string]$sha
function DownloadAndInstall
{
Param (
[string]$internalUrl,
[string]$package,
[string]$installPath
)
Download $officialUrl $cacheURl $zip
Verify-Checksum $zip $sha
Extract-7Zip $zip $installFolder
Remove $zip
Write-Host "Fetching from URL ..."
Copy-Item $internalUrl $package
$zipDir = [io.path]::GetFileNameWithoutExtension($package)
Extract-7Zip $package $installPath "$zipDir\lib $zipDir\bin $zipDir\share $zipDir\include"
Remove "$package"
}
Install $officialUrl $cacheURl $zip $sha
Install $officialUrlDebug $cacheURlDebug $zipDebug $shaDebug
if (Is64BitWinHost) {
# Install x64 bit version
$architecture = "x64"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"
# Can't set MySQL_ROOT & MySQL_LIBRARY_DIR variables. Those will enable mysql in every windows target.
# Let's use ENV_MySQL_* and use it in platform_configs
Set-EnvironmentVariable "ENV_MySQL_ROOT" "${installFolder}\mysql-connector-c-${version}-winx64"
Set-EnvironmentVariable "ENV_MySQL_LIBRARY_DIR" "${installFolder}\mysql-connector-c-${version}-winx64\lib\vs14"
DownloadAndInstall $internalUrl $packagex64 $installFolder
Set-EnvironmentVariable "MYSQL_INCLUDE_x64" "$installFolder\$baseNameX64\include"
Set-EnvironmentVariable "MYSQL_LIB_x64" "$installFolder\$baseNameX64\lib"
}
# Install x86 bit version
$architecture = "x86"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip"
DownloadAndInstall $internalUrl $packagex86 $installFolder
Set-EnvironmentVariable "MYSQL_INCLUDE_x86" "$installFolder\$baseNameX86\include"
Set-EnvironmentVariable "MYSQL_LIB_x86" "$installFolder\$baseNameX86\lib"
# Store version information to ~/versions.txt, which is used to print version information to provision log.
Write-Output "MySQL = $version" >> ~/versions.txt

View File

@@ -46,10 +46,7 @@
# From Visual studio 'C++ Universal Windows Platform support for v142 build tools (ARM64)' and 'Windows Universal C Runtime' were installed
# cd C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build
# call vcvarsamd64_arm64
# curl -o C:\Utils\openssl-3.0.7.zip http://ci-files01-hki.intra.qt.io/input/openssl/openssl-3.0.7.zip
# cd C:\Utils
# C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-3.0.7.zip
# cd C:\Utils\openssl-3.0.7
#
# perl Configure no-asm VC-WIN64-ARM --debug --prefix=C:\openssl_arm64\ --openssldir=C:\openssl_arm64\
# nmake
# nmake install
@@ -59,9 +56,9 @@
# nmake install
#################################################################################################################################################
$version = "3_0_7"
$version = "1_1_1_m"
$url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version-arm64.zip"
$sha1 = "19be15069d981b4a96f5715f039df7aaa7456d52"
$sha1 = "52963bba9b542eb885f19641f5cd78870246ea02"
$installFolder = "C:\openssl_arm64"
$zip_package = "C:\Windows\Temp\$version.zip"

View File

@@ -42,7 +42,7 @@
# This script installs OpenSSL $version.
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
$version = "3_0_7"
$version = "1_1_1m"
$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
@@ -53,7 +53,7 @@ if (Is64BitWinHost) {
$installFolder = "C:\openssl"
$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
$sha1 = "2fb73f233bc565939312782b8157bebc26a5e17b"
$sha1 = "16d83bd6d36be7b3ea85f822135352fa8f8d8134"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex64
@@ -67,7 +67,6 @@ if (Is64BitWinHost) {
Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg"
Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include"
Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib"
Prepend-Path "$installFolder\bin"
}
# Install x86 bit version
@@ -81,7 +80,7 @@ if (Is64BitWinHost) {
$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
$sha1 = "ddead693fa279ad6b1baf123b3af51a9ef289dc1"
$sha1 = "1d7146e56b201404ce67f1e636eab360211c175a"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex86

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