Compare commits

..

182 Commits
v6.4.1 ... 6.3

Author SHA1 Message Date
Toni Saario
0b6942d8db 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:23 +00:00
Pasi Petäjäjärvi
0f4f8bf10c 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-08 12:27:35 +00:00
Tor Arne Vestbø
84d3f4b7fe 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: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-08-29 13:16:32 +00:00
Assam Boudjelthia
7cf4f71c68 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-29 13:08:28 +00:00
Tatiana Borisova
36b79abe2c 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
5cb39d9c68 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
Heikki Halmet
c3584de840 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-26 11:09:43 +03:00
Tommi Mänttäri
a8a0e6cc19 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-08-25 04:58:49 +00:00
Qt Submodule Update Bot
084924307a Update submodules on '6.3 in qt/qt5'
Change-Id: Ifac85de99bae56ecbe05385ac4d2dda1bff90350
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-24 00:37:04 +00:00
Qt Submodule Update Bot
aeaa5c47f7 Update submodules on '6.3 in qt/qt5'
Change-Id: Id1ccf4fac9c3884f1816cbcea72d802939ff1269
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-22 17:32:33 +00:00
Pasi Petäjäjärvi
ad01aeb2d1 CI: Make QNX 710 x86_64 significant
Task-number: QTQAINFRA-4838
Change-Id: Ib75847afdf6ec4dea32f6b232f53768d2d5df2f9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b42e533a6f)
2022-08-22 13:06:56 +03:00
Heikki Halmet
6eed4154dc 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:17 +03:00
Qt Submodule Update Bot
de90b96075 Update submodules on '6.3 in qt/qt5'
Change-Id: I69b249963a24f6c53311fe7111e2e9deeb5f6193
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-20 04:15:14 +00:00
Heikki Halmet
9c0a91c301 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
Samuli Piippo
d5efbfe4e5 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)
2022-08-16 10:29:01 +00:00
Simo Fält
419bf67853 Add wrapper for sccache command in Linux and macOS
The sccache tends to fail every now and then. Adding a wrapper
which calls build tools directly if first call with sccacche fails.

Task-number: COIN-740
Change-Id: Ic03cf991da585d1569387118183763497ea73b72
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit e8495fc86e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-08-12 13:38:17 +00:00
Simo Fält
ae4687d5bc 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-12 13:38:16 +00:00
Qt Submodule Update Bot
dff659e171 Update submodules on '6.3 in qt/qt5'
Change-Id: I0b3fb316a96c796e16c15cfbce928badd9657efb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-11 19:33:46 +00:00
Qt Submodule Update Bot
4057b73fd1 Update submodules on '6.3 in qt/qt5'
Change-Id: Ice6dc826a034b0c30bffb5abdc20f2c6717b8fd5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-10 02:03:19 +00:00
Alexey Edelev
1e230279fa 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-05 17:45:31 +00:00
Tor Arne Vestbø
56d4c68674 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
e8c8a5d193 Update submodules on '6.3 in qt/qt5'
Change-Id: I9a5a7e06c51e8ea262d721d9bb62eae95750f3d7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-03 16:10:35 +00:00
Qt Submodule Update Bot
73de7ff8b9 Update submodules on '6.3 in qt/qt5'
Change-Id: I2590d53324c5bbb6b0ad7f880bf0b5694ef27796
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-26 00:40:46 +00:00
Simo Fält
69698757d8 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 12:05:23 +00:00
Axel Spoerl
470accfdc9 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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-21 05:56:33 +00:00
Qt Submodule Update Bot
422edc0bab Update submodules on '6.3 in qt/qt5'
Change-Id: I8f3b052e83e2b7045b5bf34ba8c9b3cc895c467f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-21 04:01:07 +00:00
Axel Spoerl
63209e4bb5 Implement cache cleanup script for openSuSE
Provisioning openSuSE VMs with a populated /home/qt.cache creates
flaky crashes of plasmashell during KDE/Plasma startup.
This scrip wipes the directory at the end of provisioning

Fixes: COIN-897
Change-Id: If61f86843e7b81dfee85610b1cd73bb15ce26658
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit aa6a82d990)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-07-20 04:43:12 +00:00
Assam Boudjelthia
39da8bd452 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 19:01:13 +00:00
Qt Submodule Update Bot
a3fc8d55c1 Update submodules on '6.3 in qt/qt5'
Change-Id: I55fba08167613996b12070b2423ac865d7df0de8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-19 11:24:12 +00:00
Qt Submodule Update Bot
d1fd21d0cc Update submodules on '6.3 in qt/qt5'
Change-Id: I9285b98ae040fa30fcaa234a39e67807bacb0c03
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-15 22:04:23 +00:00
Assam Boudjelthia
9f23169b5c 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
Assam Boudjelthia
038a928eb9 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-12 18:39:12 +00:00
Qt Submodule Update Bot
bad347de87 Update submodules on '6.3 in qt/qt5'
Change-Id: I9760f27b75d076b1853ce7a47d263b1fd496ee8f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-12 06:30:01 +00:00
Jukka Jokiniva
c8ad4c3f39 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)
2022-07-06 18:49:48 +00:00
Qt Submodule Update Bot
cd7d567a1d Update submodules on '6.3 in qt/qt5'
Change-Id: I1505581b81d56efbd06a154d417e18e834616b7a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-06 05:00:50 +00:00
Jukka Jokiniva
4bce751017 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: Alexandru Croitor <alexandru.croitor@qt.io>
2022-07-04 09:38:51 +00:00
Eike Ziller
b1acf8203e 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-29 06:37:09 +00:00
Qt Submodule Update Bot
bbda25adb8 Update submodules on '6.3 in qt/qt5'
Change-Id: I8abf0ae9f9ba606d3582f2fd02668569ad388fee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-22 07:13:01 +00:00
Qt Submodule Update Bot
b8f1464679 Update submodules on '6.3 in qt/qt5'
Change-Id: I460d776f7d69d2de09372459ad390dd1bb67c1a6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-18 23:17:49 +00:00
Toni Saario
80f60b898a 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
Joerg Bornemann
0e15878f08 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-16 10:59:03 +00:00
Alexandru Croitor
a856a1f90b 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: Jörg Bornemann <joerg.bornemann@qt.io>
2022-06-14 10:48:00 +02:00
Alexandru Croitor
7eb0b3926f 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-14 10:47:57 +02:00
Alexandru Croitor
ed593ab53d 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)
2022-06-14 10:47:54 +02:00
Alexandru Croitor
39d94c90ee 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-14 10:47:52 +02:00
Alexandru Croitor
34fb91a29b 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-14 10:47:49 +02:00
Alexandru Croitor
6e7b4549a9 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)
2022-06-14 10:47:47 +02:00
Alexandru Croitor
47a7d9b16d 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)
2022-06-14 10:47:44 +02:00
Alexandru Croitor
8255351cfb 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)
2022-06-14 10:47:42 +02:00
Alexandru Croitor
908143ed2b 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)
2022-06-14 10:47:38 +02:00
Alexandru Croitor
fdb35c62e4 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-14 10:47:36 +02:00
Alexandru Croitor
65bb9213be 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)
2022-06-14 10:47:34 +02:00
Alexandru Croitor
ecf6af3645 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)
2022-06-14 10:47:31 +02:00
Alexandru Croitor
d9647cb570 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)
2022-06-14 10:47:29 +02:00
Alexandru Croitor
fc026bf851 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)
2022-06-14 10:47:26 +02:00
Alexandru Croitor
34d3521a47 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)
2022-06-14 10:47:24 +02:00
Alexandru Croitor
1e5b63ab19 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)
2022-06-14 10:47:21 +02:00
Alexandru Croitor
ae4d183302 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)
2022-06-14 10:47:19 +02:00
Alexandru Croitor
565869b0a6 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)
2022-06-14 10:47:16 +02:00
Toni Saario
c4124c22bc 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-07 20:18:03 +00:00
Simo Fält
ce0d6e3632 Provisioning: Install additional python3.7 for Windows 11
Change-Id: Ia8ba4cee4efd6e9c8ffe5403879ad585b6e97576
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 0c85cce1b3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-06-06 04:52:17 +00:00
Qt Submodule Update Bot
9af3e106a7 Update submodules on '6.3 in qt/qt5'
Change-Id: Idb2ff8f78d91108b72f7b40d850c31adc80b0929
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-01 22:23:07 +00:00
Heikki Halmet
08930fa8aa Disable Software Updates for macOS
Change-Id: Id80d66cfebaa17311d7bfd927f3ce33ba0b81661
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit e5b819e26d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-25 04:23:13 +00:00
Andreas Buhr
a7b7ee295d Activate testing of developer build for Android in qtdeclarative
Fixes: QTBUG-101865
Fixes: QTBUG-102943
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit fb2ad5889e)
Change-Id: I4bf94330c42e3188321e659c3dc9ede2e4ed3c7b
2022-05-23 22:29:13 +02:00
Qt Submodule Update Bot
5dec389f04 Update submodules on '6.3 in qt/qt5'
Change-Id: I631c2a69e914daa2148c3caf38c90a8a73edaf37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-20 18:49:05 +00:00
Assam Boudjelthia
17a331629f Coin:Android: Enable tests for more modules - Part 4
This adds tests of more modules:
qtcharts, qtspeech, qtwebchannel, qtwebsockets, qtdatavis3d

Task-number: QTBUG-88846
Change-Id: Ie98ad9af7c260a72e9309836b7733106254da38a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 178334bd29)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-19 10:06:24 +00:00
Andreas Buhr
9ca0951470 Revert "Activate testing of developer build for Android in qtdeclarative"
This reverts commit 2e29f9e19f.

Reason for revert: Some patches blacklisting Android need to
be integrated first in qtdeclarative/6.3.

Change-Id: I782cd394a8f5020f8aecc0e9c08f00a4fc9f833a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-05-19 10:30:49 +02:00
Qt Submodule Update Bot
5d266909a4 Update submodules on '6.3 in qt/qt5'
Change-Id: I9c2d8f39ef8c368139937845b8b125b987598f60
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-18 13:56:26 +00:00
Andreas Buhr
2e29f9e19f Activate testing of developer build for Android in qtdeclarative
Fixes: QTBUG-101865
Fixes: QTBUG-102943
Change-Id: Ib6a2345f77b52749c5e7945d19e2eaa52e311758
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit fb2ad5889e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-18 13:43:30 +00:00
Qt Submodule Update Bot
a880f5a081 Update submodules on '6.3 in qt/qt5'
Change-Id: I6d64d78ad6158e9963e2fc5d3afc16625b01b59c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-11 07:56:10 +00:00
Assam Boudjelthia
3178e36d9a Coin:Android: Enable tests for more modules - Part 3
This adds tests of more modules:
qtquick3d, qtremoteobjects, qtcoap, qtlottie, qtmultimedia,
qtnetworkauth, qtserialport, qtwebview.

Task-number: QTBUG-88846
Fixes: QTBUG-100448
Fixes: QTBUG-100449
Change-Id: I0804b5be4bf17684a3d307e0a024304fa108af94
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 10143120c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-10 15:02:52 +00:00
Oliver Wolff
cf68969d30 Update MSVC installer bootstrapper before updating MSVC itself
If there is an outdated MSVC installer bootstrapper an update to MSVC
might silently fail. Make sure that we update the bootstrapper before
calling the actual update.

NOTE! This change also upgrades MSVC 2019 version to 16.11.10

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

Fixes: QTQAINFRA-4813
Change-Id: Ia595ceb5b373d1210670d3f357fb501bca1c8272
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a91868e2c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-08 06:21:35 +00:00
Heikki Halmet
2ce252d362 Provisioning: Install addtional Python 3.10.0 for Windows 10 21H2
Change-Id: Ic65b3b5b8dcea2ed918b005dbc8d4ea75daba61f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 6c0950edf8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-08 06:21:32 +00:00
Heikki Halmet
c2239ef4ba Remove protobuf scripts for Windows
Script is currently failing in windows and no one has noticed this.
So apparently script is not needed by any module. If this will be needed
in the future then script needs to be fixed and merged back to
provisioning.

Change-Id: Ia3deb3011b0cb6a9e145d0f126d4ab6723ce79f3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 1cc99e61dd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-05-08 06:21:29 +00:00
Alexandru Croitor
d6fc3c0f4f CMake: Normalize submodule names by stripping tqtc- prefixes
In tqtc repos, the dependencies.yaml files may point to tqtc- prefixed
repos, which can lead to build failures when doing a top-level build
and the local repo directory names have no tqtc- prefix.

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

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

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

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

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

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

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

Fixes: QTBUG-102883
Change-Id: I6806b119dd32b14dc0d9711dc829bfc5130d1e6f
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 30068f2223)
2022-04-29 16:22:15 +02:00
Joerg Bornemann
64512eafba CMake: Don't ignore repos without dependencies.yaml
While resolving inter-repository dependencies, we skipped dependencies
if their dependencies.yaml did not exist.  This is wrong.  Instead, such
repos must be handled as if they don't have dependencies.

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

This amends commit 8a94d1e294.

Fixes: QTBUG-100549
Change-Id: I523ed74cfa96a4bab238f3a475f28c3ac55dd7b4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit ce9f7751e3)
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-04-29 16:22:14 +02:00
Joerg Bornemann
0ec83c2903 CMake: Rework inter-repository dependency resolution
In certain cases the dependency resolution between Qt repositories
resulted in a wrong order, for example qtsvg being handled before
qtbase.  See the linked task for an example.

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

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

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

Fixes: QTBUG-98268
Change-Id: I1425fd9c802fa71ae42549ceb14bcfc4c0a62078
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 8a94d1e294)
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-04-29 16:22:12 +02:00
Qt Submodule Update Bot
d7133e4de0 Update submodules on '6.3 in qt/qt5'
Change-Id: I785c9fd0f1966acb3ba3529bb4d0697492ccc8c4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-28 08:36:22 +00:00
Tatiana Borisova
5fac70b541 Update CI environment for INTEGRITY
- Add libplanedef, libmmosalfile, libOSAbstraction, libopenwfd, libpmem libraries into environment
- updated integrity_toolchain.cmake paths according existing CI folder structure

Change-Id: Icda1a82f9d9afda38a3556f23d2f141ef2965c44
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2d7bba81c0)
2022-04-24 13:20:29 +03:00
Tatiana Borisova
212e3ff69f Improve INTEGRITY cmake toolchain file
- Add possibility do not create megapack.a library
  manually for work with INTEGRITY framework.
- add 'frigor=accurate' option to control vectorization
  of floating-point calculations
- fix olink typo

Change-Id: I67561e438d6f12ed62b6b41742970bdf38d0011c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 4cb9ded166)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-21 08:34:50 +00:00
Qt Submodule Update Bot
ed29fd691f Update submodules on '6.3 in qt/qt5'
Change-Id: I7c8637713b68f68d23658f1f6df3468af8a8d44c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-20 13:57:57 +00:00
Qt Submodule Update Bot
e19841a1a9 Update submodules on '6.3 in qt/qt5'
Change-Id: I2d983eeae37338de062923e0ab9a1e043b0a7822
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-19 18:31:57 +00:00
Simo Fält
e58d46caa3 Install python3.8 compatible wheels to wheel cache
Change-Id: I42283e1aa9d731e86adccaef3baed25713c9b60d
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 5d53c917b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-19 10:04:00 +00:00
Qt Submodule Update Bot
39649eae80 Update submodules on '6.3 in qt/qt5'
Change-Id: Ia1d5c72c5ebc0b6d292d6b30225911db847c8d47
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-18 15:46:34 +00:00
Qt Submodule Update Bot
abd43c859b Update submodules on '6.3 in qt/qt5'
Change-Id: I25ca7db6de5f43f3cc268e077f56c3a8849cee91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-15 04:02:16 +00:00
Heikki Halmet
5c219dae54 Provisioning: Install Android 11 automotive emulator
This is needed after moving from internal tqtc-qt5 branches to qt5.
Android 11 image was built internally.

Task-number: QTQAINFRA-4343
Change-Id: Ie0c4c5853079303ef9d4537f3b7b06ab62f14e3b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 12a87cba0a)
2022-04-14 07:14:58 +00:00
Alexandru Croitor
e071cbc8ec coin: Allow using configure instead of cmake for top-level builds
This is the qt5 counterpart to the qtbase instructions to allow
using configure instead of cmake when configuring a top-level build.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: Ie5af31f9349a6dd88fa7699d40dad659180814e2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 2ee43055ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-13 12:53:13 +00:00
Jani Heikkinen
02cdd7049d Update LA 4.4.1
Task-number: QTBUG-101714
Change-Id: I4b9a88be5bfda3b542d9c10c51cc94f36dade932
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Santtu Ahonen <santtu.ahonen@qt.io>
(cherry picked from commit 1734139bf4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-12 09:15:18 +00:00
Alexandru Croitor
3b714271fb CMake: Switch an OpenSUSE config to build with CMake 3.16.8
To ensure we don't introduce regressions building Qt with the lowest
version of CMake that we support.

Task-number: QTQAINFRA-4844
Task-number: COIN-823
Change-Id: I59b6a0ed6851a5fbed701c4f6ea050062bddb773
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 0cfa1fa561)
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-04-12 10:02:11 +02:00
Alexandru Croitor
591a6210d6 CMake: Provision minimum supported CMake version 3.16 on OpenSUSE
This will allow us to switch one of the Linux OpenSUSE platform
configurations to build with an older version of CMake, to ensure
we don't introduce regressions.

Task-number: QTQAINFRA-4844
Change-Id: I2aa51175e3c393af079ab1d2b4648ced1fdf6a4a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 75bab52bb9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-12 08:02:09 +00:00
Qt Submodule Update Bot
a98cab0d91 Update submodules on '6.3 in qt/qt5'
Change-Id: I2d4c67d9dad1fc7c8cd94af034f5a1a8c4821ee0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-09 08:32:35 +00:00
Tor Arne Vestbø
dd4edc5445 coin: Run macOS x86_64 developer build tests for all modules
Aligns the way we test x86_64 and arm64 developer builds.

Change-Id: I87ea5e183b5ee29c62304b22eaf20c4b46ec3b0d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 3072446274)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-07 20:19:07 +00:00
Antti Kokko
c05d17862b Coin: Remove 'Packaging' feature from target which is 'Insignificant'
'Insignificant' feature should not be used with target
that has 'Packaging' feature enabled.

Current:
'Packaging, Sccache, AndroidTestRun, Insignificant, AbortTestingOnFirstFailure'

After this change:
'Sccache, AndroidTestRun, Insignificant, AbortTestingOnFirstFailure'

Change-Id: I0662885db80ed9ca93d5c66902029665382a75fa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 8b9d185ad3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-07 10:37:39 +00:00
Qt Submodule Update Bot
a4b9525f19 Update submodules on '6.3 in qt/qt5'
Change-Id: Ic14ea9f4280b45b9929dfac72c3a01daabe52388
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-06 23:39:10 +00:00
Heikki Halmet
440fae35c2 Make Windows 11 21H2 significant
Task-number: QTQAINFRA-4673
Change-Id: I7eebc889dbc9ecc7c741147a2703575b5bfeb04d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit d6a7527384)
2022-04-05 08:17:33 +03:00
Qt Submodule Update Bot
e53dd54b2c Update submodules on '6.3 in qt/qt5'
Change-Id: I17a63e4ce5ae2a373b383efef0e57a3b08156fe8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-04 04:41:48 +00:00
Pasi Petäjäjärvi
fccc912655 CI: Add env variable to indicate we are running tests in CI
Some tests change what they test depending if this env variable is set.
This was left out from 6.2 and 6.3 branches accidentally as it was added
only for dev branch at fba918784f as part
of bigger cleanup which introduced usage of qt-testrunner.py insted.

Pick-to: 6.2
Change-Id: I0f55e42a6ae5b64132d13812ae0567975aedaa0e
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2022-04-01 17:18:19 +00:00
Eike Ziller
0574df28c6 COIN/QtCreator: Add machine for Qt 5 based build
Since we still support Qt 5 based builds of Qt Creator, we'd like
to have that combination as part of the precheck.

Change-Id: I8f752f6e2aff4bebd644a87a1f51255ca482d337
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
(cherry picked from commit e2b2c06558)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-01 13:08:35 +00:00
Pasi Petäjäjärvi
20acf71ead CI: Add QtCoap network testservers for QNX QEMU
Change-Id: Ibc18edaf4a1d9dec309396eb80744b6a21738382
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 45a92d5f26)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-31 12:39:08 +00:00
Heikki Halmet
6ceca935bf Provisioning: Install Chromedriver Chromium
This is needed by WebAssembly

Change-Id: I3e828d643d2780308514b2939db5a1b4032c66ac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: David Skoland <david.skoland@qt.io>
(cherry picked from commit f8311eaadf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-31 06:39:43 +00:00
Assam Boudjelthia
509714f288 Add Android tests to Qt modules - part 2
The following modules are passing CI, so enabling them is possible
now; qt3d, qtconnectivity, qtmqtt, qtquicktimeline, qtsensors,
qtserialbus, qt5compat, qtpositioning, qtscxml, qttranslations.

Task-number: QTBUG-88846
Change-Id: Ic1048d0fadd551f42ef2d074b3b905cf3c8da339
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 807b259ea4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-30 05:48:24 +00:00
Heikki Halmet
5a6483e5cb Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Change-Id: I461a26cf258a3e5c62faf719612f643507662f72
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 73295cc05c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-29 07:10:53 +00:00
Pasi Petäjäjärvi
ff1471bcb4 CI: Add dns entry for network test server (not docker)
Servername qt-test-server is still used as local server name in tests
like networkselftest.

Change-Id: Iadda2254d4a45e95f90523cae90518fa74b24d6c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 6f5c0fbdf0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-26 21:32:26 +00:00
Pasi Petäjäjärvi
283c13f7d5 CI: Add current directory to PATH because security update for QProcess
Because of 29fceed2ffb41954a63001414bd042611f2d4980 now all tests that
use binaries local to test folder will fail. Add current directory to
ssh connection PATH to fix this. On other platforms than QNX, this
happens to work as function qt_internal_collect_command_environment
sets the absolute directory path of external binary to PATH. Still tests
would fail when running directly tst_* binary instead via ctest.

Change-Id: I670d78a2a4362dc8d6faf271f2ad2a90ce2a8aa9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit c1e7cf5c25)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-26 14:56:27 +00:00
Heikki Halmet
f6d803b379 Add prebuilt Android OpenSSL package for OpenSSL 1.1.1m
Used OpenSSL source package 1.1.1m was changed little bit. All
ANDROID_NDK_HOME strings were replaced with ANDROID_NDK_ROOT in
Configurations/15-android.conf file

Task-number: QTQAINFRA-4864
Task-number: QTBUG-101863
Change-Id: Ia3d82005734ba69f1cc85708c867ae1955938739
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 686481f48c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-25 09:34:16 +00:00
Toni Saario
0f0d9344e3 Add webos targets
Task-number: QTQAINFRA-4518
Change-Id: Ib198a9ec02993be6eed92a2a6f9d80659fc9d5d7
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit ce51e1158a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-23 14:28:35 +00:00
Cristian Adam
64d08c5039 Update MinGW 11.2.0 to rev3
Revision 3 updates gdb to version 11.2.0.

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

Task-number: QTBUG-101653
Change-Id: I92a319a943d18ec10e5e0da3cd770ba7cde26f13
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c76e26a5fa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-22 07:55:36 +00:00
Fabian Kosmale
0420b8e8d2 Set QT_SUPERBUILD early
That will allow qtbase's .cmake.conf to check whether it is meant to be
used in a superbuild or only for qtbase.

Task-number: QTBUG-101640
Change-Id: I035c86f32497004cc1b8441456604106bacadad4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 14e486a8c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-20 10:29:12 +00:00
Assam Boudjelthia
9362c7ec43 Add Android tests to Qt modules - part 1
This enables testing for Android for the modules:
qtdeclarative, qtsvg, qtshadertools, qtimageformats, qtlanguageserver.

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

Task-number: QTBUG-88846
Change-Id: Ibe0dcbdc5d468e884570bf4908f8ddee0793103c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 523eb8e1ea)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-03-19 11:27:32 +02:00
Qt Submodule Update Bot
05b49c7b60 Update submodules on '6.3 in qt/qt5'
Change-Id: I3494598d30e78331006ffbe417355f1892dd20cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-18 04:57:55 +00:00
Heikki Halmet
98f696ce30 Fix Openssl android installation
Current provisioning installation is broken. Current package replaced
the old openssl-android-master-1.1.1m.zip and shasum changed.

Task-number: QTQAINFRA-4848
Change-Id: Id5e3bc1a81f8b634668d189c7647eac7c612020a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 96fe74b540)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-17 11:28:30 +00:00
Heikki Halmet
ed8d1c76ae Provisioning: Run msvc 2019 update at the beginning of provisioning
When script was run with prefix 99 the installation process wasn't
finished before machine got rebooted. Moving the script at
beginning of provisioning seems to help with the situation. This is
not a proper fix but the best we have right now.
We can change this later if/when we find the root cause for this.

Task-number: QTQAINFRA-4813
Change-Id: Icbc2b0b33905990df611bdb494ed9b22801633fd
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 1597f43512)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-17 11:28:27 +00:00
Pasi Petäjäjärvi
ba761fab29 CI: Add ssl certificates for QNX
Expects Ubuntu 20.04 LTS with ca-certificates package installed

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

Change-Id: Id7be7867e5bea1f354456e8d440f9979c402e977
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 477877352a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-14 19:06:49 +00:00
Pasi Petäjäjärvi
28d8ebdd5b CI: Remove installation of QNX toolchain from linux platforms
These linux platforms are not used when building for QNX

Change-Id: I071834053b09b1cea962796076bb0cd2fc6e0fff
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c4869161b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-14 19:06:37 +00:00
Qt Submodule Update Bot
c4d99abe5e Update submodules on '6.3 in qt/qt5'
Change-Id: I4dab3397fa5afb657444944f6f45b33735e1cf4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-14 18:43:35 +00:00
Qt Submodule Update Bot
6e4d0b7e87 Update submodules on '6.3 in qt/qt5'
Change-Id: I1135c2abec5cd8113e77ce48bd9f8530cfa0fe6d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-12 11:38:46 +00:00
Assam Boudjelthia
78925a27d1 Coin: Fix Documentation target on tqtc/android-automotive
The Documentation target in tqtc-android-automotive.yaml has
-DFEATURE_cxx20=ON flag which is not present in the main
cmake_platforms.yaml on this branch, this might have been the cause for
failing docs build under qtinterfaceframework.

Change-Id: Ife84d424673cd7ccf82d0046839ebefa71305f0e
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-03-10 19:29:57 +00:00
Assam Boudjelthia
6aaa6ecfe2 Rename the Android emulator to be more descriptive
Because we want to add Android 12 emulator for testing, it's important
to have a more descriptive emulator name. For this one, it includes
api_23 part.

Task-number: QTBUG-88846
Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a4cc949b8d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-10 19:29:57 +00:00
Qt Submodule Update Bot
298627d025 Update submodules on '6.3 in qt/qt5'
Change-Id: I161936a7d33f66efd84a17b280f26355905ba82f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-10 15:54:11 +00:00
Toni Saario
e76d47cae9 Update git
Older git version does not allow fetching single specific sha1.

Change-Id: Ib795659a597042876a5c7b6fab3875fe1e39873d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit a2393b5882)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-08 08:56:51 +00:00
Simo Fält
cd944bec30 Provisioning: Make sure one can call virtualenv as module with python3.8
This will fix qtinterfaceframework's config test.

Change-Id: Ifd2f52e27d31f140402d98861339ef5f7b253c23
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit e1f18be950)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-07 20:23:58 +00:00
Qt Submodule Update Bot
0946334a2b Update submodules on '6.3 in qt/qt5'
Change-Id: Ib13bff9dea1a7274de2653342465efd79bcf11b2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-05 10:46:26 +00:00
Simo Fält
b229146083 Provisioning: Install additional Python 3.8 for RHEL 8.4
Change-Id: Ic9893505d3805bcc3cbed972a95ce4a756e4c32a
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 171f29f091)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-04 22:01:53 +00:00
Qt Submodule Update Bot
62d5a030a9 Update submodules on '6.3 in qt/qt5'
Change-Id: I3737dc748e232a6f13e782cdebcbe6ebbb296a53
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-03 17:18:06 +00:00
Alexandru Croitor
4e2f44f06c coin: Split top-level build instructions
Makes it a bit cleaner to follow.

Change-Id: I063581126b6d09f98fb38862c8af5531dc513aca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a9c9418c8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-02 16:38:40 +00:00
Jani Heikkinen
8f6de37d2b Update LICENSE.QT-LICENSE-AGREEMENT
Newest version is 4.4 so update it in the git as well

Task-number: QTBUG-98971
Change-Id: I55f06da7778fe8ce9c7c449cb2b011d37b97244c
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
(cherry picked from commit cbeea07854)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-01 08:11:29 +00:00
Assam Boudjelthia
3ed9fa8a37 Mark QtAA Android test as insignificant until proven to work
Make sure this doesn't block the repo, untill we have the whole
Android Automotive pipeline working.

Change-Id: I1aaef98cb724c8e299b2adacce36d8e3f786b432
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 2fd91cfe5d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-21 09:48:16 +00:00
Assam Boudjelthia
7c0540fc10 Add Documentation tatget to tqtc-android-automoitve
Amends 69536e4b45.

Fixes: QAA-1026
Change-Id: Ieed387fb20ec4ebf1a4fbd2633da9c9e98b0a60b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit c36ce3dd49)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-21 09:48:08 +00:00
Heikki Halmet
1239512b38 Add passing targets as significant
There is still autotests failures in one Windows 11 target

Task-number: QTQAINFRA-4673
Change-Id: I2f7958a6da358069799db18143789c99bb3f4dac
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 6cea45bfb8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-18 19:21:21 +00:00
Volker Hilsheimer
344253220f Prune Linux configurations in CI
Remove the various FEATURE_xxx=off configurations, we don't support them
and if we break stuff, then those issues are easily fixed after the fact
and users relying on those combinations can provide patches. Most of them
are obsolete with Qt 6 anyway, as users can just not link against QtGui
or QtWidgets.

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

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

Change-Id: Ia35713fc7373d54b82a11be14e2272ff011a51ab
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 2e4d6af574)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-17 13:57:47 +00:00
Heikki Halmet
9fd8a4a687 Change DBUILD_EXAMPLES to DQT_BUILD_EXAMPLES for Windows 11
Change-Id: I93f5c80d78b5085317cfb7446cb21e231b9b5a24
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-02-16 18:48:46 +00:00
Heikki Halmet
13abc96385 Move bluetooth script under correct platform folder
Change-Id: If1c873bb3334639477e43f8d5d83d62338f6f4c0
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 3f263aa742)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-16 18:48:06 +00:00
Heikki Halmet
a7fed578ed Provisioning: Update OpenSSL to version 1.1.1m
Change-Id: I93702b9faac5abc9fc01a5725cf34a17a94f0bea
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 8732165461)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-16 18:47:59 +00:00
Qt Submodule Update Bot
3af2d458dd Update submodules on '6.3 in qt/qt5'
Change-Id: Iff67ff909e5df94f212788fb842e7c33babe4169
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-12 07:30:39 +00:00
Topi Reinio
bdb72da050 coin: Update provisioned qdoc, qtattributionsscanner binaries
Latest qdoc introduced a new command (\qmlvaluetype) used in
qtdeclarative documentation, as well as other fixes and
improvements.

Change-Id: I6453468fb36dbe38d62f5eb9de74beffd568673b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 69b329a55f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-11 03:10:50 +00:00
Assam Boudjelthia
322f6b1f04 Update tqtc-android-automotive targets and add test target
The module is android specific and thus tests need to be disabled
for platforms other than Android Automotive.

Change-Id: If7528bc0845c6266d77f94e8e6c7d0ba67075d1a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 69536e4b45)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-10 16:14:19 +00:00
Qt Submodule Update Bot
57451734dc Update submodules on '6.3 in qt/qt5'
Change-Id: Iddbbfd4f3b9b2700060d52903b9fb83bee032ea8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-09 15:30:10 +00:00
Heikki Halmet
ecc9f2f425 Remove old Windows 10 targets
Windows 10 21H2 is now significant for all targets

Task-number: QTQAINFRA-4539
Change-Id: I9435c11f7df6b7c2c77a5af10ebc5e0da5717ccb
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit ac2bdfb93a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-04 15:48:11 +00:00
Heikki Halmet
75a52c9eec Make Win 10 21H2 Environment variables to match with the old Win 10
Fix few differencies. E.g. Conan env variables are missing

Change-Id: Id08c422b1df61c2acaf59cf2bcdb0cc55cdcb1e7
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 0e641142c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-04 15:48:05 +00:00
Heikki Halmet
51752c6b7d Set correct Emscripten environment variables
Needed environment variables are set during emsdk installation when
installation is done using emsdk.git. But those are not set
as permanently. To have correct values we need to get them from
install environment and set them permanently for build environment.

Change-Id: Ifb80aa4a93608b79faffc8c59002c89804f60570
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 88cde9e500)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-04 11:26:17 +00:00
Heikki Halmet
32a225b398 Upgrade Xcode and Command Line Tools version to 13.2
Xcode 13.2 works only in macOS 11.3/12.0 or newer

Task-number: QTQAINFRA-4607
Change-Id: Ic2034a2091a041a6daa0f342e5820641488c068b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 72997d7039)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-04 13:26:10 +02:00
Heikki Halmet
e954954e99 Provisioning: Start using latest macOS 11 version 11.6
New tier 1 image's name format is qtci-macos-11-x86_64

Change-Id: Ieb23b64a0981bdd282d2ae482dd5ccda3f7ecaed
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 1865d70ef8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-04 13:26:03 +02:00
Alexandru Croitor
4a4eac6e65 CMake: Pass QT_BUILD_EXAMPLES instead of BUILD_EXAMPLES
BUILD_EXAMPLES was the old way to disable building examples, which is
not used anymore. This should remove the warning about an unused
BUILD_EXAMPLES variable.

Fixes: COIN-762
Change-Id: Icf88d617e564939bcff5047f83d029e93df16401
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit ec6e186d10)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-03 09:38:05 +00:00
Heikki Halmet
00252d11c7 Make Windows 10 21H2 significant
Task-number: QTQAINFRA-4600
Change-Id: I0ffe3f94bfef9c15a1cbc98cd0afed8bf33c68c1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 279841383d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-01 03:58:26 +00:00
Heikki Halmet
e00ab6299e Change Windows 11 targets Insignificant flag to cover only autotests
Task-number: QTQAINFRA-4673
Change-Id: Ia841fec1fe4adcedf0af2ddfeeb9a19fd915baf7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 10897d6514)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-01 03:58:25 +00:00
Qt Submodule Update Bot
19c8518536 Update submodules on '6.3 in qt/qt5'
Change-Id: Ia4019f891a5da5d2f97d917f7845c32eff6b3184
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-31 22:35:12 +00:00
Alexandru Croitor
295eb3ea8b CMake: Fix linux static tests config to actually run
In 3c38cc22ce the dash was accidentally
removed and Coin was happy with it.

Reintroduce the dash.

Change-Id: Idc5d3833191b0390e2d0aa480681a5350d289037
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 93afb606b4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-31 17:57:27 +00:00
Pasi Petäjäjärvi
40dfcecd4a CI: Add font support for QNX qemu
Task-number: QTBUG-99168
Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 848a7d5fa3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-30 05:13:14 +00:00
Pasi Petäjäjärvi
6b8dc3a273 CI: Enable developer build for QNX x86_64
Task-number: QTBUG-99168
Change-Id: I119f47ba0ee36a19a6daca05383c90304b34e97a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 7486226c7a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-30 05:13:05 +00:00
Pasi Petäjäjärvi
8a8f1b7654 CI: Update libraries because of new QNX toolchain
QNX toolchain provides newer libfreetype which depends on new libbz2
library (qnx710-20211207-linux.tar.xz).

Task-number: QTBUG-99168
Change-Id: I4bcb0b536ace594dd95faeed8e5a8d99e53afadd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 2592bbe8c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-30 05:12:58 +00:00
Pasi Petäjäjärvi
c69258f175 CI: Increase size of QNX qemu image for data partition
Some of the autotest require more free space to pass

Task-number: QTBUG-99168
Change-Id: Iff4a4493e75d2770d691b936547143518a80e315
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 4a5550cc03)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-30 05:12:47 +00:00
Qt Submodule Update Bot
4b6d11a77f Update submodules on '6.3 in qt/qt5'
Change-Id: If7823e3610645a58b7bbd40bd3fac081962a48d0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-27 11:34:39 +00:00
Jani Heikkinen
2d329b06e1 Add qtlanguageserver as a optional dependency for qtdeclarative
Fixes: QTBUG-99737
Pick-to: dev
Change-Id: I9dd71496b6ea974003158ffdd3e651beed60c31d
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-01-27 11:34:34 +00:00
Jukka Jokiniva
fb43a90fd1 Add yaml file for Android Automotive
Change-Id: I1007453ba47e7a7be4fe60ef065695189eb44f98
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 06b5cd95e6)
2022-01-19 08:23:36 +00:00
Heikki Halmet
56a251d9a6 Provisioning: Install up-to-date google Chrome for Wasm auto tests
Task-number: QTBUG-99062
Change-Id: Ib9ebcad5d9700c09d01d1ba23fed716d3a3cae4b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-01-12 09:07:46 +02:00
Heikki Halmet
9c5af22a53 Provisioning: Change installation order between libicu and gtk3
Gtk3-devel includes dependency which conflicts with libicu-devel.
Changing installation order should solve it

Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 1e8939b4b2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-11 22:00:07 +00:00
Qt Submodule Update Bot
5fe2c8489a Update submodules on '6.3 in qt/qt5'
Change-Id: Id6c006f1504e450276be4ba26b4f04f8f481d3ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-08 22:22:55 +00:00
Toni Saario
d25830872e Provision conan on arm macOS
Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 81dcae4f93)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-07 16:34:52 +00:00
Heikki Halmet
928414e328 Remove Insignificant flags from Creator, flashing-wizard and saferenderer
Change-Id: If4941f00f51281df4f2f233bd89bfaf0d0ed5a0d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 854e478223)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-04 15:38:31 +00:00
Heikki Halmet
c7bd8fc94a Add OPENSSL_ROOT_DIR for macOS Android targets
Enabling OpenSSL requires OPENSSL_ROOT_DIR environment variable.

Task-number: QTBUG-97243
Change-Id: I055c236d0f346ddc2e2aff873f2bd98cacfb5ec3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit ebb9836451)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-04 07:40:42 +00:00
Heikki Halmet
a4850c0a7c Make macOS 12 on ARM developer build tests significant
Task-number: QTQAINFRA-4649
Change-Id: Ia12310a3439058f706d55242ece5ee185073f7ce
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 000691d833)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-03 13:08:39 +00:00
Tor Arne Vestbø
2ec7e5a365 coin: Move all builds over to macOS 12
Change-Id: Ief01ca81cda49d518e910e01f70f78a5c8430ed7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit b19b02173c)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-23 11:13:10 +00:00
Heikki Halmet
2ef984eac1 Replace .ci.local suffix with .ci.qt.io
Plan is to terminate .ci.local soon

Change-Id: I8198ea744eeb91974569d47b2147f08b18f97f73
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit d4cb44ad71)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-23 08:56:10 +00:00
Tor Arne Vestbø
75f2419e5c coin: Make macOS 12 on ARM packaging tests significant
Change-Id: I6e89626e52f21d19e8665769b4d8f6ee9a54e537
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit ccf24d5f2a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-21 13:44:35 +00:00
Tor Arne Vestbø
72d28c6e0f Bump qtconnectivity
Change-Id: I8b9ea944ed95d70a41fb7abcef199b77cb15d353
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 649592deea)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-21 12:00:38 +00:00
Toni Saario
dce7c48f58 Add qt-conan-common platforms
Change-Id: I99c9b148d4a3b23acc8c4bbd36cd1ea9ad32eac9
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit 099f184880)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-20 08:28:19 +00:00
Kai Köhne
efc8d985c6 Replace LGPL2.1 only header with LGPL3 one
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit becb423e80)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-20 04:26:48 +00:00
Ville-Pekka Karhu
dceadf3e76 macOS: Upgrade Xcode to 13.2
Task-number: QTQAINFRA-4607
Change-Id: Ice52c8f4199e124d92b994cab38151dd712986bf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit fe35c4dbb0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-19 19:47:21 +00:00
Ville-Pekka Karhu
eb018be96e macOS provisioning: Disable bluetooth
Change-Id: Ia981b4ab37a6ca15a566feb2fdc176253b419193
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 20c580e5db)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-19 19:47:21 +00:00
Heikki Halmet
8f409a0c71 Remove InsignificantTests flag from Windows 10 targets
Change-Id: Ib6ec59762f1188d1dc2a133fdf44628d47fd1b57
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ccf269f5da)
2021-12-18 20:40:54 +02:00
Heikki Halmet
83d1af1b22 Upgrade MSVC 2019 and build tools versions to 16.11.8
Task-number: QTQAINFRA-4704
Change-Id: I77e83f392869e81b20cdc11e970f24448bb66420
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 9d09f9cee9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-17 15:47:53 +00:00
Jani Heikkinen
9103f23a09 Update latest qt license agreement
Change-Id: Iee3b30b298bac748133daf3f0e58f8dab195a2fe
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
(cherry picked from commit b9a59fe113)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-17 15:47:53 +00:00
Heikki Halmet
808c16c866 Remove Rhel 8.2 targets
Rhel 8.4 is already in use

Task-number: QTQAINFRA-4515
Change-Id: I32bba97143adb5243e5ba500eceaad9723a7209e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b730181404)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-16 09:59:07 +02:00
Jani Heikkinen
bc9a03f7f6 Update qttools submodule
Change-Id: Ic538882d50ff40a94a7b05d8fbc10b52da61fdbf
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit f55b82ee1d)
2021-12-15 06:13:14 +00:00
Pasi Petäjäjärvi
8f783c41aa CI: Add image support for QNX qemu
Task-number: QTBUG-99168
Change-Id: If040af8d074e7e197449eb4be68507e83214d393
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 1cb9c1caef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-15 03:23:40 +00:00
Pasi Petäjäjärvi
5d3ac77196 CI: Add timezone support for QNX qemu
Task-number: QTBUG-99168
Change-Id: Ie27f53fbf68c656dfdd7ddba72ef1c991416faeb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 10a443c181)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-15 03:23:32 +00:00
Alexandru Croitor
fecfd6f771 Coin:Android: set ANDROID_SDK_ROOT explicitly in macOS 12 config
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Amends 7e2882d0a7

Augments d59825d250

Task-number: QTBUG-97002
Change-Id: I96fb543521d70784d75e524d8b48ac72c42e6815
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 6e7de2b76c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-14 10:48:59 +00:00
Heikki Halmet
1f2aef79bf Remove duplicate MinGW environment variables
Change-Id: I2018b0c46b9708f699e5da6155e95151a49394fb
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 5ce8c724d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-14 10:48:59 +00:00
Toni Saario
4e7f922835 Add tqtc-qtdigitaladvertising platforms
Change-Id: I839e0c2509dfac800a06d9c791b693dbc8681a52
(cherry picked from commit 1a1028ea20)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-14 10:48:59 +00:00
Pasi Petäjäjärvi
65a96ae8cf CI: Add inotify support for QNX
Adds Filesystem event manager server to image and also add HOME env
varbiable for root user.

Task-number: QTBUG-99168
Change-Id: I4df10f17f4e274dc0d21fea1a767c351ba3c8362
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 06edc60e1d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-14 07:04:03 +00:00
Jani Heikkinen
6f82a2fad6 Adjust submodule branches
Change-Id: Ibbcb381be98a3c20b12402266c4361f3f7531cfd
2021-12-13 07:46:50 +02:00
199 changed files with 968 additions and 1215 deletions

100
.gitmodules vendored
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -8,5 +8,4 @@ instructions:
Build:
- !include "{{qt/qt5}}/coin_qt_build_template.yaml"
Test:
- !include "{{qt/qt5}}/coin_bic_tests.yaml"
Test: []

View File

@@ -2,7 +2,9 @@ Version: 2
Include: [
cmake_platforms_qemu.yaml,
cmake_platforms_qemu_qnx710.yaml,
cmake_platforms_target_android.yaml,
cmake_platforms_target_android_host_linux.yaml,
cmake_platforms_target_android_host_macos.yaml,
cmake_platforms_target_android_host_windows.yaml,
cmake_platforms_wasm.yaml,
macos.yaml
]
@@ -11,7 +13,7 @@ Configurations:
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'
Configure arguments: '-make examples -developer-build -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
-
Id: 'Ubuntu-20.04-host'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -25,14 +27,14 @@ Configurations:
Id: 'OpenSUSE-15.3-host'
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
]
-
Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests', 'UseConfigure']
Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -47,7 +49,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}}\..',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64']
-
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2019'
@@ -78,11 +80,10 @@ Configurations:
Id: 'Windows10_21H2-MSVC2019-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer'
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
@@ -93,8 +94,8 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64',
'CONAN_PROFILE=coin/conan/profiles/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}}'
@@ -103,7 +104,7 @@ Configurations:
Id: 'Windows11_21H2-MSVC2019-x64-host'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..'
@@ -116,23 +117,21 @@ Configurations:
Platform dependency: 'Windows11_21H2-MSVC2019-x64-host'
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64'
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON'
]
-
Id: 'RHEL-8.4-host'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
Features: ['Packaging', 'Sccache', 'UseConfigure']
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'
'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
]
-
Id: 'ios-universal'
Template: 'qtci-macos-12-x86_64-105'
Template: 'qtci-macos-12-x86_64-102'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
@@ -141,8 +140,8 @@ Configurations:
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang'
]
-
Id: 'Windows10_21H2-Mingw11-x64-host'
@@ -155,7 +154,7 @@ Configurations:
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'
'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw'
]
-
Id: 'Windows10_21H2-LLVM-x64-host'
@@ -184,7 +183,7 @@ Configurations:
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
@@ -195,7 +194,7 @@ Configurations:
-
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',

View File

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

View File

@@ -12,8 +12,10 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'QT_CMAKE_DIR=/opt/cmake-3.21.3/bin',
'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin',
"TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci'",
"TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'",
"COIN_CTEST_RESULTSDIR=/home/qt/work"
]
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -8,21 +8,8 @@ Configurations:
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang'
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples'
]
-
Id: 'webassembly-thread-asyncify'
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'OpenSUSE-15.3-host'
Features: ['Sccache', 'DisableTests']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_thread=ON -DQT_QMAKE_DEVICE_OPTIONS="QT_EMSCRIPTEN_ASYNCIFY=1"',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'WebAssembly'
@@ -34,11 +21,10 @@ Configurations:
'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang']
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF'
]
-
Template: 'qtci-macos-12-x86_64-105'
Template: 'qtci-macos-12-x86_64-102'
Target os: 'WebAssembly'
Compiler: 'Clang'
Target compiler: 'Clang'
@@ -47,6 +33,6 @@ Configurations:
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-webassembly-x86_64-clang'
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc'
]

View File

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

View File

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

View File

@@ -9,7 +9,7 @@ Configurations:
-
Id: 'macos-latest-xcode-universal-packaging-build'
Template: 'qtci-macos-12-x86_64-105'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -17,18 +17,7 @@ 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',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
]
-
Id: 'macos-latest-xcode-arm64-universal-build'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
]
# Test on all supported macOS versions (deployment targets)
@@ -47,7 +36,7 @@ Configurations:
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-11-x86_64-tests'
Template: 'qtci-macos-11-x86_64-105'
Template: 'qtci-macos-11-x86_64-104'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
@@ -65,22 +54,10 @@ Configurations:
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-12-x86_64-tests'
Template: 'qtci-macos-12-x86_64-105'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-12-arm64-arm64-universal-build-tests'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-arm64-universal-build'
-
Id: 'macos-12-x86_64-arm64-universal-build-tests'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-arm64-universal-build'
# =========================================================================
# Developer build. Single architecture builds.
@@ -90,7 +67,7 @@ Configurations:
-
Id: 'macos-latest-xcode-x86_64-developer-build'
Template: 'qtci-macos-12-x86_64-105'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
@@ -122,7 +99,7 @@ Configurations:
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
-
Id: 'macos-11-x86_64-developer-build-tests'
Template: 'qtci-macos-11-x86_64-105'
Template: 'qtci-macos-11-x86_64-104'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
@@ -134,7 +111,7 @@ Configurations:
Platform dependency: 'macos-latest-xcode-arm64-developer-build'
-
Id: 'macos-12-x86_64-developer-build-tests'
Template: 'qtci-macos-12-x86_64-105'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'

View File

@@ -16,5 +16,4 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_LIBRARY_PATH={{.Env.QNX_710}}\target\qnx7\aarch64le\lib;{{.Env.QNX_710}}\target\qnx7\aarch64le\usr\lib -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON'
]

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -49,10 +49,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
majorminorversion="3.21"
version="3.21.3"
version="3.21.1"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
SHA1="5461d4f066a728445e0b6be0e4d250b828323908"
SHA1="591e3b0729ae07c37c1fa3c6adde7cc21387059d"
targetFolder="/opt/cmake-$version"
appPrefix="cmake-$version-linux-x86_64"

View File

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

View File

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

View File

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

View File

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

View File

@@ -80,9 +80,9 @@ if [ ! -d "$targetFolder" ]; then
fi
# QNX SDP
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-20211207-linux.tar.xz"
targetFile="qnx710.tar.xz"
sha1="134af2e0f75d7b7c516f824fafee265b89e51d48"
sha1="03f87bad1c5522d6aefcc74dd5ccacd43240ded3"
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
sudo cp $aarch64le_toolchain $targetPath

View File

@@ -1,112 +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 Android sdk and ndk.
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
set -ex
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/android"
sdkTargetFolder="$targetFolder/sdk"
basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
toolsVersion="2.1"
# toolsFile dertermines tools version
toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersionLatest="r23b"
ndkVersionDefault="$ndkVersionLatest"
sdkBuildToolsVersion="31.0.0"
# this is compile sdk version
sdkApiLevel="android-31"
toolsSourceFile="$basePath/$toolsFile"
function InstallNdk() {
ndkVersion=$1
if [[ ! -d "${targetFolder}/android-ndk-${ndkVersion}" ]]; then
echo "Unzipping Android NDK $ndkVersion to '${targetFolder}'"
ndkSourceFile="$basePath/android-ndk-$ndkVersion-darwin*.zip"
sudo unzip -q "$ndkSourceFile" -d "$targetFolder"
fi
}
InstallNdk $ndkVersionDefault
InstallNdk $ndkVersionLatest
echo "Unzipping Android Tools to '$sdkTargetFolder'"
sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
echo "Changing ownership of Android files."
sudo chown -R qt:wheel "$targetFolder"
# Run the following command under `eval` or `sh -c` so that the shell properly splits it
sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'"
sudo mkdir "$sdkTargetFolder/cmdline-tools"
sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \
"platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \
| eval $sdkmanager_no_progress_bar_cmd
echo "Checking the contents of Android SDK..."
ls -l "$sdkTargetFolder"
SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$targetFolder/android-ndk-$ndkVersionDefault"
SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
echo "Android NDK = $ndkVersionDefault" >> ~/versions.txt

View File

@@ -49,10 +49,10 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
majorminorversion="3.21"
version="3.21.3"
version="3.21.1"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
SHA1="6775e6eebae22b5ab3010609132c093e65cc4587"
SHA1="5845da632d0f073c7761df4e78efb4405e00ac5a"
appPrefix="cmake-$version-macos-universal"
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

View File

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

View File

@@ -49,13 +49,6 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="1.1.1m"
ndkVersionLatest="r23b"
ndkVersionDefault=$ndkVersionLatest
prebuiltOpensslNdkShaDarwinLatest="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
prebuiltOpensslNdkShaLinuxLatest="f58dcb32b2d3e5edc7e5141ae139a50547805f60"
prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest
prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest
: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
# Source built requires GCC and Perl to be in PATH.
exports_file="/tmp/export.sh"
@@ -88,34 +81,18 @@ 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/openssl ]]; 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}"
mv "${HOME}/openssl" "${HOME}/openssl_android_ndk_${ndkVersion}"
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"
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21_darwin.tar.gz"
sha="d8c189f8a329263365c73bc471b6c9c68d117e3a"
else
InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaLinuxDefault "linux"
SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaLinuxLatest "linux"
SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21.tar.gz"
sha="db028f25ca4d000fe2317c3abfdfa0c234833549"
fi
targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
tar -xzf "$targetFile" -C "${HOME}"
opensslHome="${HOME}/openssl/android/openssl-${version}"
SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
echo "OpenSSL for Android = $version" >> ~/versions.txt

View File

@@ -62,4 +62,11 @@ 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

@@ -0,0 +1,14 @@
#!/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

@@ -47,20 +47,19 @@ set -ex
# This script will fetch and extract pre-buildt squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
version="7.0.1"
qtBranch="63x"
version="6.7.1"
qtBranch="62x"
installFolder="/opt"
squishFolder="$installFolder/squish"
preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
licenseFile=".squish-license"
licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/$licenseFile"
licenseSHA="e84b499a2011f9bb1a6eefc7b2338d7ae770927a"
licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license"
licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
if uname -a |grep -q Darwin; then
compressedFolder="prebuild-squish-$version-$qtBranch-mac.tar.gz"
sha1="ed8aa2e902808741fb9496a0d339d4c145530eef"
compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz"
sha1="1526d4d57f8025f83aad836a43e8fa0317dbddc2"
else
compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
sha1="a9de35bba9b4dd9afabdde4df14564428745a979"
sha1="d412c3389d95a65341b51d2e14cba47ce3b54a86"
fi
mountFolder="/tmp/squish"
@@ -102,7 +101,7 @@ sudo tar -xzf "$targetFileMount" --directory "$installFolder"
echo "Unmounting $mountFolder"
sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
sudo mv "$installFolder/rta_squish_$qtBranch" "$squishFolder"
sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
if uname -a |grep -q Darwin; then
sudo xattr -r -c "$squishFolder"
fi
@@ -110,40 +109,39 @@ fi
if uname -a |grep -q "Ubuntu"; then
if [ ! -e "/usr/lib/tcl8.6" ]; then
sudo mkdir /usr/lib/tcl8.6
#this needs to be copied only to squish_for_qt62
sudo cp "$squishFolder/squish_for_qt62/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
#this needs to be copied only to squish_for_qt6
sudo cp "$squishFolder/squish_for_qt6/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
fi
fi
DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/$licenseFile"
DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/.squish-3-license"
echo "Changing ownerships"
sudo chown -R qt:$usersGroup "$squishFolder"
sudo chown qt:$usersGroup "$HOME/$licenseFile"
sudo chown qt:$usersGroup "$HOME/.squish-3-license"
echo "Set commands for environment variables in .bashrc"
if uname -a |grep -q "Ubuntu"; then
echo "export SQUISH_PATH=$squishFolder/squish_for_qt62" >> ~/.profile
echo "export PATH=\$PATH:$squishFolder/squish_for_qt62/bin" >> ~/.profile
echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile
echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile
else
echo "export SQUISH_PATH=$squishFolder/squish_for_qt63" >> ~/.bashrc
echo "export PATH=\$PATH:$squishFolder/squish_for_qt63/bin" >> ~/.bashrc
echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.bashrc
echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.bashrc
fi
echo "Verifying Squish, available installations:"
ls -la $squishFolder
if "$squishFolder/squish_for_qt62/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
echo "Squish for Qt6.3 installation tested successfully"
if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
echo "Squish for Qt5 installation tested successfully"
else
echo "Squish for Qt6.3 test failed! Package wasn't installed correctly."
echo "Squish for Qt5 test failed! Package wasn't installed correctly."
exit 1
fi
if "$squishFolder/squish_for_qt63/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
echo "Squish for Qt6.2 installation tested successfully"
if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
echo "Squish for Qt6 installation tested successfully"
else
echo "Squish for Qt6.2 test failed! Package wasn't installed correctly."
echo "Squish for Qt6 test failed! Package wasn't installed correctly."
exit 1
fi

View File

@@ -51,83 +51,59 @@ 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 = "1.1.1m"
$ndk_version_latest = "r23b"
$ndk_version_default = "$ndk_version_latest"
$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}_fixes-ndk_root.tar.gz")
$openssl_sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
$prebuilt_sha1_ndk_latest = "0aebe55d2436f235e1a24ae9d1030cb6ce8f31da"
$prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest"
$version = "1.1.1m"
$ndk_version = "r22b"
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-fixes-ndk_root-windows.zip")
$sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
$prebuilt_sha1 = "2bf5354b2264ed80e85fea3705ba434a38fe563e"
$destination = "C:\Utils\openssl-android-master"
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-fixes-ndk_root-windows.zip"
function Install($1, $2) {
$ndk_version = $1
$prebuilt_sha1 = $2
# msys unix style paths
$ndkPath = "/c/Utils/Android/android-ndk-${ndk_version}"
$openssl_path = "/c/Utils/openssl-android-master"
$cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
if ((Test-Path $prebuilt_url)) {
Download $prebuilt_url $prebuilt_url $prebuilt_zip
Verify-Checksum $prebuilt_zip $prebuilt_sha1
Extract-7Zip $prebuilt_zip C:\Utils
Remove $prebuilt_zip
} else {
# 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-${version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz $zip
Verify-Checksum $zip $sha1
# msys unix style paths
$openssl_path = "/c/Utils/openssl-android-master"
$ndk_path = "/c/Utils/Android/android-ndk-${ndk_version}"
$cc_path = "$ndk_path/toolchains/llvm/prebuilt/windows-x86_64/bin"
Extract-7Zip $zip C:\Utils\tmp
Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
Move-Item C:\Utils\tmp\openssl-${version} $destination
Remove "$zip"
$prebuilt_url_ndk = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${openssl_version}-for-android-used-ndk-${ndk_version}-windows.zip"
$prebuilt_zip_ndk = Get-DownloadLocation ("prebuilt-openssl-${openssl_version}-for-android-used-ndk-${ndk_version}-windows.zip")
Write-Host "Configuring OpenSSL $version for Android..."
Push-Location $destination
# $ must be escaped in powershell...
if ((Test-Path $prebuilt_url_ndk)) {
Write-Host "Install prebuilt OpenSSL for Android"
Download $prebuilt_url_ndk $prebuilt_url_ndk $prebuilt_zip_ndk
Verify-Checksum $prebuilt_zip_ndk $prebuilt_sha1
Extract-7Zip $prebuilt_zip_ndk C:\Utils
Remove $prebuilt_zip_ndk
} 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}_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
function CheckExitCode {
Extract-7Zip $openssl_compressed C:\Utils\tmp
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"
param (
$p
)
Write-Host "Configuring OpenSSL $openssl_version for Android..."
Push-Location $destination
# $ must be escaped in powershell...
function CheckExitCode {
param (
$p
)
if ($p.ExitCode) {
Write-host "Process failed with exit code: $($p.ExitCode)"
exit 1
}
if ($p.ExitCode) {
Write-host "Process failed with exit code: $($p.ExitCode)"
exit 1
}
$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
$make = 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 make -f $openssl_path/Makefile build_generated`"")
CheckExitCode $make
Pop-Location
Remove-item C:\Utils\tmp -Recurse -Confirm:$false
}
Move-Item $destination "${destination}-${ndk_version}"
$configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
CheckExitCode $configure
$make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
CheckExitCode $make
Pop-Location
Remove-item C:\Utils\tmp -Recurse -Confirm:$false
}
# Install NDK Default version
Install $ndk_version_default $prebuilt_sha1_ndk_default
if (Test-Path -Path ${destination}-${ndk_version_latest}) {
Write-Host "OpenSSL for Android Latest version is the same than Default. Installation done."
} else {
# Install NDK Latest version
Install $ndk_version_latest $prebuilt_sha1_ndk_latest
}
Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_DEFAULT" "${destination}-${ndk_version_default}"
Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_LATEST" "${destination}-${ndk_version_latest}"
Write-Output "Android OpenSSL = $openssl_version" >> ~/versions.txt
Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"
Write-Output "Android OpenSSL = $version" >> ~/versions.txt

View File

@@ -1,6 +1,6 @@
############################################################################
##
## 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.
@@ -46,17 +46,12 @@
# That's why we need to use Andoid-21 API version in Qt 5.9.
# NDK
$ndkVersionLatest = "r23b"
$ndkVersionDefault = $ndkVersionLatest
$ndkChecksumLatest = "6e3fb50022c611a2b13d02f5de5c21cc7206a298"
$ndkChecksumDefault = $ndkChecksumLatest
$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"
$ndkOfficialUrlDefault = "https://dl.google.com/android/repository/android-ndk-$ndkVersionDefault-windows.zip"
$ndkFolderLatest = "c:\Utils\Android\android-ndk-$ndkVersionLatest"
$ndkFolderDefault = "c:\Utils\Android\android-ndk-$ndkVersionDefault"
$ndkZip = "c:\Windows\Temp\android_ndk.zip"
$ndkVersion = "r22b"
$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip"
$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip"
$ndkChecksum = "96ba1a049303cf6bf3ee84cfd64d6bcd43486a50"
$ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
# SDK
$toolsVersion = "2.1"
@@ -80,20 +75,11 @@ function Install($1, $2, $3, $4) {
Download $offcialUrl $cacheUrl $zip
Verify-Checksum $zip "$checksum"
Extract-7Zip $zip C:\Utils\Android
Remove $zip
}
Write-Host "Installing Android NDK $ndkVersionDefault"
Install $ndkCachedUrlDefault $ndkZip $ndkChecksumDefault $ndkOfficialUrlDefault
Set-EnvironmentVariable "ANDROID_NDK_ROOT_DEFAULT" $ndkFolderDefault
if (Test-Path -Path $ndkFolderLatest) {
Write-Host "Android Latest version is the same than Default. NDK installation done."
} else {
Write-Host "Installing Android NDK $nkdVersionLatest"
Install $ndkCachedUrlLatest $ndkZip $ndkChecksumLatest $ndkOfficialUrlLatest
Set-EnvironmentVariable "ANDROID_NDK_ROOT_LATEST" $ndkFolderLatest
}
Write-Host "Installing Android NDK $nkdVersion"
Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl
Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder
Install $toolsCachedUrl $sdkZip $toolsChecksum $sdkOfficialUrl
New-Item -ItemType directory -Path $toolsFolder
@@ -131,4 +117,4 @@ cmd /c "dir C:\Utils\android"
Write-Output "Android SDK tools= $toolsVersion" >> ~/versions.txt
Write-Output "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
Write-Output "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
Write-Output "Android NDK = $ndkVersionDefault" >> ~/versions.txt
Write-Output "Android NDK = $ndkVersion" >> ~/versions.txt

View File

@@ -40,7 +40,7 @@
. "$PSScriptRoot\helpers.ps1"
$majorminorversion = "3.21"
$version = "3.21.3"
$version = "3.21.1"
$zip = Get-DownloadLocation ("cmake-" + $version + "-windows-i386.zip")
$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-windows-i386.zip"
@@ -50,7 +50,7 @@ Write-Host "Removing old cmake"
Remove "C:\CMake"
Download $officialurl $cachedurl $zip
Verify-Checksum $zip "f853ad791629141ce4121b175a2afdb4e46e7a54"
Verify-Checksum $zip "7271b8c568f428af433f3aae80c292ef868993c5"
Extract-7Zip $zip C:
$defaultinstallfolder = "C:\cmake-" + $version + "-windows-i386"

View File

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

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