Compare commits

..

116 Commits
6.6.0 ... 6.5.2

Author SHA1 Message Date
Qt Submodule Update Bot
808f63250c Update submodules on '6.5.2 in qt/qt5'
Change-Id: I08ce333a6e43447f3990211b5ac38f8e42b361ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-07 21:59:52 +00:00
Qt Submodule Update Bot
a4dd97eb2d Update submodules on '6.5.2 in qt/qt5'
Change-Id: I55a7dd7be1fd229077b58841bdc18e36b2130720
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-06 03:18:34 +00:00
Qt Submodule Update Bot
6a564e2ca7 Update submodules on '6.5.2 in qt/qt5'
Change-Id: I3d71880c99cb558eef88d72828aaf3541b50e624
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-03 05:53:15 +00:00
Teemu Holappa
3597addab2 Change macOS12 template from 106 to 105
Provisioning fails in 106 template.

Change-Id: Ia0a39b9006cc63d0e587bd18fc189e2a47408635
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
(cherry picked from commit 075592750a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-30 03:01:24 +00:00
Antti Kokko
39e71874c6 Update qtsaferenderer.yaml, add 'Target os' field
Add 'Target os' field for static configurations
to make sure targets are not overwritten when
exporting the integration.

Change-Id: I0c1b6602423b97f5be5dd7d146a37a3f41eced00
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
(cherry picked from commit 7d3fec671f)
2023-06-29 08:05:21 +00:00
Qt Submodule Update Bot
f03a47caad Update submodules on '6.5.2 in qt/qt5'
Change-Id: Ib898a31bbbd5a530c1ba186cc526e7fc18967730
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-06-29 03:18:06 +00:00
Qt Submodule Update Bot
8d51a12667 Update submodules on '6.5.2 in qt/qt5'
Change-Id: Idc7793963822f06128cdb54b715bc789af5b73bf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-06-22 19:47:47 +00:00
Qt Submodule Update Bot
4588fcb542 Update submodules on '6.5.2 in qt/qt5'
Change-Id: I259edde0e386119211f5df28ceaf08f1a8e0acc8
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2023-06-22 11:42:47 +00:00
Qt Submodule Update Bot
74d6db944a Update submodules on '6.5.2 in qt/qt5'
Change-Id: I15fc4b0110ee6628c49a4352007222ab461d55aa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-06-20 03:37:38 +00:00
Simo Fält
b6707952cd COIN: Disable linux on arm config again
The only host is down for now.

Change-Id: I82cc9461a16d054da6611f2e2ee0be6426755660
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 82327bfc4d)
2023-06-15 09:08:31 +00:00
Jani Heikkinen
4b88657d9a Adjust submodule branches
Change-Id: I95a0939954706d50ac9a808832f5ef268e2c2958
2023-06-14 06:23:00 +01:00
Amir Masoud Abdol
ba16228de4 Show an error when a submodule is missing, or misspelled
Stop the configuration and show an error if one of the submodules is
missing, or misspelled in `-submodules` option.

Fixes: QTBUG-114133
Change-Id: I890d4f5f0614288a2be422f839e04a0086a58403
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
(cherry picked from commit bb13b7dadf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-12 23:50:43 +00:00
Jøger Hansegård
4ed7ed6920 Add CMakeUserPresets.json to .gitignore
The CMakeUserPresets.json file can be used to simplify configuring Qt,
particularly with tools such as Visual Studio and Visual Studio Code.

As opposed to the CMakePresets.json, the CMakeUserPresets.json should
only contain user specific configurations, and should never be checked
into source code management system. Therefore it makes sense to ignore
it globally.

Change-Id: I971d4505b302dc40e3dd33b6d4680c2067047c27
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit cf4eabc8c2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-12 23:50:43 +00:00
Joerg Bornemann
9a31ac4792 init-repository: Fix wrong remote URLs in cloned submodules
The cloned submodules had a wrong origin remote URL if the origin remote
of the local qt5.git repository had a trailing slash.

Fix this by stripping the trailing slash when stripping the trailing
".git" from qt5.git's remote.

Fixes: QTBUG-113793
Change-Id: I199b6e1915f67558ecfe69f7300d0f9ef0d4b232
Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 6c40b6160e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-12 23:50:42 +00:00
Simo Fält
3421cc61c1 Provisioning: Install nodejs to enable qtwebengine on arm linux
Change-Id: Id39dd3474e0d5f8d214ecf74255073650c82ab47
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit e14434a7ea)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-06-08 16:37:48 +03:00
Simo Fält
6165dbbe3a CI: Enable packaging config on arm linux
Task-number: COIN-1029
Change-Id: I369ce20e24b9adf6b64274dfe07bdfc25888e46f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 89edadf3be)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-06-08 16:37:45 +03:00
Qt Submodule Update Bot
381dd1233b Update submodules on '6.5 in qt/qt5'
Change-Id: I7ff5d125595bfa64493f0a938864643af8fd142c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-06-06 19:58:43 +00:00
Qt Submodule Update Bot
44877587a9 Update submodules on '6.5 in qt/qt5'
Change-Id: I72071b0951ec8a506ba0a632999449146bcc726a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-29 18:13:07 +00:00
Qt Submodule Update Bot
2e8d07be10 Update submodules on '6.5 in qt/qt5'
Change-Id: Ia0354cbf5470c1f45a16c91fef07dd3eee4c4918
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-26 02:00:59 +00:00
Qt Submodule Update Bot
227129971b Update submodules on '6.5 in qt/qt5'
Change-Id: I0831f11250391b422ebd03ec115a1e82c42692f7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-24 14:52:56 +00:00
Qt Submodule Update Bot
e422959b72 Update submodules on '6.5 in qt/qt5'
Change-Id: Ieb6cb85a696001d07efa69da1b01f4b6805be0ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-23 13:02:28 +00:00
Qt Submodule Update Bot
4266bba080 Update submodules on '6.5 in qt/qt5'
Change-Id: I57270fb9dd655d905d244c97f8bd6051f5622ff7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-22 16:47:39 +00:00
Alexey Edelev
49327b053c Disable openssl for ffmpeg library
Openssl library causes backward compatibility issues. We need to disable
it to make ffmpegmediaplugin work on all supported linux platforms.

Fixes: QTBUG-113324
Change-Id: Ib266e2cf67e9336fb206735b8b2418fccd8f7b00
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit e1b7e865ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-21 18:08:44 +00:00
Qt Submodule Update Bot
8ed3ca4015 Update submodules on '6.5 in qt/qt5'
Change-Id: I428ec9d0e79ea1d28ed664b4c4e0276f464c7306
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-19 20:14:51 +00:00
Jani Heikkinen
44cf97b06f Update qtqa submodule
Change-Id: Ibe10c422c08fb03f43158dc51fa7c779877df728
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2023-05-19 10:10:43 +03:00
Rami Potinkara
b9af6ca0a2 Android: Android OS 13 API 33 to CI as maximum version
Android 13 replaces Android 12 as max version in CI.
Android 6 kept as minimum version of Android in CI.

Task-number: QTQAINFRA-5392
Task-number: QTQAINFRA-5431
Change-Id: If85c6f63d52055e2ba95f92c154b20a6b809c7dc
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit ef12163e25)
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-05-19 07:10:39 +00:00
Qt Submodule Update Bot
401785e168 Update submodules on '6.5 in qt/qt5'
Change-Id: Iff6cae8a9c52cd9596e33c3ec682a900c10d267c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-18 12:56:03 +00:00
Jani Heikkinen
9ef28bdc83 Update Appendix 9 in LICENSE.QT-LICENSE-AGREEMENT
Task-number: QTBUG-113132
Change-Id: I1244bd0e7318120cf5ebde4daae38b9fba862237
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
(cherry picked from commit 9aae493bc6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-18 11:50:10 +00:00
Alexey Edelev
9b481175c4 Uninify MSVC version that is used in provisioning
We pick the oldest build tools we can find because there is lower
chance that the produced binaries will be incomaptible with the newer
version of MSVC.

With the current provisioning design we also cannot change the MSVC
version for the each package on demand. Once Enter-VsDevShell is called
it litters the powershell environment and blocks the use of
Enter-VsDevShell second time. It could be better to run each .ps1 file
in own instance of powershell to avoid mixing build environment.

Amends f58afd5476

Change-Id: Ie752cfc8b69ed985e61ec16209007dd586611866
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 84df93d37e)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-05-17 22:55:28 +00:00
Samuel Mira
e4447d0b55 Fix FFmpeg provisioning for Android armv7a
Altered install-ffmpeg.ps1 script to build android armv7a archicture

Task-number: QTQAINFRA-5476
Change-Id: I5179174c8676a3016df2922c00030e9d45a9009c
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 2751db4d29)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-17 22:55:21 +00:00
Teemu Holappa
ba9e54417e Update qtsaferenderer build configurations
Task-number: QSR-2110
Task-number: QSR-2010
Change-Id: Idbf265ba461d3b383e1bae8b41f00a8cf76e4d3a
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a07826f70f)
2023-05-17 12:56:53 +03:00
Qt Submodule Update Bot
38f519ed1b Update submodules on '6.5 in qt/qt5'
Change-Id: I3596758247fa8c0d1022804dff7c5e0746c5c310
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-15 08:24:38 +00:00
Tero Heikkinen
0b5f41537b Provisioning: Upgrade Xcode version to 14.3 for macOS 13
Change also upgrades command line tools

Task-number: QTQAINFRA-5485
Change-Id: I057e4c850c3c7ba938002a2ec444637ae9f51cf4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 08ac268561)
2023-05-10 11:51:08 +03:00
Qt Submodule Update Bot
d5e5ab121e Update submodules on '6.5 in qt/qt5'
Change-Id: Ia4058ddcd38a6ea1ef76fc3ccf01630485d2c0ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-04 00:32:24 +00:00
Samuel Mira
e3b200d728 Fix FFmpeg provisioning for Android in arm64, x86 and x86_64
Added install-ffmpeg-android script for the android cross-compile
Removed android stuff from install-ffmpeg
Changed the yaml variables to include the target arch
Added the arm64 target arch

Task-number: QTQAINFRA-5476
Change-Id: Id9609ed0427f2fc42f7f27e7787a81ad145f59be
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 99afe7199e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-03 11:22:10 +00:00
Qt Submodule Update Bot
ef743be7f3 Update submodules on '6.5 in qt/qt5'
Change-Id: Ifbdcde685a069cadcfea74f131ff301ca4f53f97
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-01 11:23:56 +00:00
Qt Submodule Update Bot
590cad6793 Update submodules on '6.5 in qt/qt5'
Change-Id: I06049c41ee0b16bd1be918bb65b9186162687cff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-28 23:15:39 +00:00
Qt Submodule Update Bot
891880425a Update submodules on '6.5 in qt/qt5'
Change-Id: I214f03516a9972151c2334113eea6fa2ee957007
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-27 01:33:05 +00:00
Eike Ziller
cb9d0b0c12 COIN/Qt Creator: Use macOS 11
Since Qt 6.5 doesn't support anything earlier

Change-Id: Ia5c5b011c774c34311d1cdc2afda914d53d16429
Reviewed-by: David Schulz <david.schulz@qt.io>
(cherry picked from commit cb8e0553fe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-19 10:23:16 +00:00
Qt Submodule Update Bot
b3c088d680 Update submodules on '6.5 in qt/qt5'
Change-Id: I2063309f8c75250f752f687416be943e8734aa87
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-18 17:24:20 +00:00
Artem Dyomin
f65288d120 Update ffmpeg version to n6.0
Checked the basic functionality on macOS, linux, and windows.
To be tested in detail.

Change-Id: I109f52ab33d58088332a3885c83d622815edd22e
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit aed030bb90)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-16 22:43:57 +00:00
Tim Jenssen
29d9e74435 coin: fix typo in mac template
Change-Id: I3fe8902deb85870ecab33b1ce492386255763fc7
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 967bdc47ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-15 08:24:57 +00:00
Rami Potinkara
c289dd100e Make qtbase significant for Android 12 emulator in CI
qtbase was last insignificant module. When below "needed to"
are in, qtbase can be mark as significant.

Needed to
- increase emulator RAM to 16GB
- RAM increase to 16GB fixed tst_QByteArrayLarge cases
- SKIP tst_QRhi::tessellation(Vulkan)
- SKIP tst_QOpenGLWidget::reparentHidden
- SKIP tst_qvulkan cases

Above SKIP bugs to be fixed later in Qt 6.5 as bugs.

Task-number: QTQAINFRA-4733
Task-number: QTQAINFRA-5391
Task-number: QTBUG-108832
Task-number: QTBUG-108844
Task-number: QTBUG-111235
Task-number: QTBUG-111236
Change-Id: I5d3e99ad144dbcf192873458dedd0300ed622beb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 7ad2801f92)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-14 14:35:09 +00:00
Qt Submodule Update Bot
5cdbd915a4 Update submodules on '6.5 in qt/qt5'
Change-Id: I54ad021346978a0a9a411fbe88f81cf7df5483a6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-14 02:46:01 +00:00
Qt Submodule Update Bot
78efd7bf10 Update submodules on '6.5 in qt/qt5'
Change-Id: I2306db6676f24b527caf191b901ada3bd32600f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-12 20:17:53 +00:00
Qt Submodule Update Bot
5bec50ae9b Update submodules on '6.5 in qt/qt5'
Change-Id: I622b6961df6f4f9081a00bef28d5b73bc0d98c86
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-05 12:26:09 +00:00
Topi Reinio
ad1c93e955 coin: Update provisioned qdoc, qtattributionsscanner binaries
Update qtattributionsscanner to the latest version from dev branch,
b3630c56. This includes support for SecurityCritical and Comments
fields. It also fails the build on incorrect input files, ensuring
no incorrect content can integrate.

Update qdoc to the same version from qttools, bringing multiple
improvements.

Fixes: QTQAINFRA-5450
Change-Id: I7caa59ed982d9c41efcbe3d2381d47c7d037e9c6
(cherry picked from commit 195a438395)
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2023-03-25 09:59:14 +00:00
Shawn Rutledge
1231ca784d Add shadertools and webengine to qtdoc "recommends" list
The photosurface demo uses a custom shader and the PDF image plugin.
The document viewer also needs QtPDF.

Task-number: QTBUG-108924
Change-Id: I1236e6b679dc512874299747921407384ce29a67
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 6ed6f5f220)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-23 05:59:29 +00:00
Heikki Halmet
2bde49c335 Provisioning: Use Docker registry when pulling images in macOS
Task-number: QTQAINFRA-5428
Change-Id: I0034922dd7cc42b55b3c1e852070df29a54c529b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit d5ba87dff6)
2023-03-21 05:52:46 +00:00
Heikki Halmet
1b254c32f0 Remove *yocto_ssh_configurations script
Not needed anymore

Change-Id: I9b813a66593525a2328bed95c128b5979a410fc7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit f080b88d85)
2023-03-21 05:52:46 +00:00
Heikki Halmet
237c75fb2b Remove CentOS provisioning scripts
Task-number: COIN-1019
Change-Id: I7a8cb4c7f23d2d1c9c1d67338479ebe2ae86b322
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 81d4943e27)
2023-03-21 05:52:46 +00:00
Heikki Halmet
7a3e084a4a Enable MySQL for Windows
Task-number: QTQAINFRA-4999
Change-Id: Id967473858673253f536cb91f9a95d9d6a3d7f27
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ec2dd3438c)
2023-03-21 05:52:46 +00:00
Heikki Halmet
c72f195cba Use Docker registry when pulling images
Let's pull needed images from repo-clones docker registry to avoid
reaching the Docker Hub rate limit

Task-number: QTQAINFRA-5428
Change-Id: I1305ac54e68e962f52bf435c5578248d0ada02db
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit af58d89b61)
2023-03-21 05:52:46 +00:00
Qt Submodule Update Bot
dc84684e45 Update submodules on '6.5 in qt/qt5'
Change-Id: I9d53bcb58d318ad44aac55cd594bda8166a2b458
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-21 05:01:03 +00:00
Liang Qi
3f16ecb328 Enable RunDependencyTests for qtwayland
It will run all auto tests in dependency modules, such as qtbase,
qtdeclarative and etc, with QtWayland QPA plugin, but insignificant
for now.

So the time for testing will be similar like qtbase, about 1-2 hours.

Task-number: QTBUG-66335
Change-Id: I66259f975e102aed90af516885fcf6b1cbddb5f6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 204ea530a7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-20 09:32:49 +00:00
Artem Dyomin
ce9f86f287 Enable network support for FFmpeg
This patch configures FFmpeg with network support. This enables QtMM
to handle network source such as HTTP, HTTPS, or RTSP.
Details:
- on macOS and windows ffmpeg uses native security backend so we don't
  include openssl to the build. Additional patch for linking
  with the security backend is in QtMM commit under the same task.
- on linux we add openssl; for all CI linux platforms libssl-dev is
  installed.

Task-number: QTBUG-110708
Change-Id: I80a7dfda702c4d554df3a7380aac642890a28b94
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 9b88e24d71)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-17 09:20:27 +00:00
Qt Submodule Update Bot
5e4de74c32 Update submodules on '6.5 in qt/qt5'
Change-Id: I252c37a443e3d46ec3dd0754fa5653d50706ffbd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-11 13:45:48 +00:00
Volker Hilsheimer
d7507263ed Provision flite on OpenSUSE 15.4
Unclear why that didn't get added when this set of provisioing scripts
was set up.

Change-Id: I70cc347f2a6109fdde773c647cbe9a5b4819517e
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 8b12598bf8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-10 15:42:40 +00:00
Qt Submodule Update Bot
302d467c59 Update submodules on '6.5 in qt/qt5'
Change-Id: I545565b225568cbba5b69ecb70f26c6806e804bf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-09 03:26:24 +00:00
Qt Submodule Update Bot
b44fb996e6 Update submodules on '6.5 in qt/qt5'
Change-Id: I84dd1fe34dc2120fc76e840f603a8cb4d98a62b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-06 17:26:01 +00:00
Qt Submodule Update Bot
95e77687a0 Update submodules on '6.5 in qt/qt5'
Change-Id: Iebd410f709fd325058954a3a0e070b22199f0d70
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-02 20:55:50 +00:00
Qt Submodule Update Bot
3166a0a7cf Update submodules on '6.5 in qt/qt5'
Change-Id: Ie24d26ec98f402e790ebc07cfafa303817db373e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-02 00:10:47 +00:00
Topi Reinio
4258273614 Provisioning: Update qdoc/qtattributionsscanner binaries on Ubuntu 22.04
The qdoc binary was originally built against libclang from LLVM 15, and
that version has problems parsing source code when C++20 support is
enabled.

Update to a version that is built against libclang from LLVM 12.

Fixes: QTBUG-111186
Change-Id: I068b3e6d4d006ba6e55e2144c0fdeaeada931b73
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 6e0a189923)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-01 09:12:51 +00:00
Qt Submodule Update Bot
121aa7f72f Update submodules on '6.5 in qt/qt5'
Change-Id: I35780f48c30111e0ea89ceae6cd61084497cfa69
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-28 12:39:06 +00:00
Johanna Äijälä
d64669c50b Provisioning: add Android SDK, NDK and openSSL to Ubuntu22.04
Needed for RTA, for better coverage RTA uses Ubuntu as a host in Android
RTA tests.

Change-Id: I4670102bc865847f07dccc47ba56d09734e269cd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d5d0bd27f4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-21 10:47:10 +00:00
Qt Submodule Update Bot
0b6642c563 Update submodules on '6.5 in qt/qt5'
Change-Id: I2b3f9bdf3da3bdb3d54c9f423778a11e3da8a92e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-20 12:36:41 +00:00
Qt Submodule Update Bot
34980e252b Update submodules on '6.5 in qt/qt5'
Change-Id: Ica21e91019eea437096d8c9c3fc7d40fb6aadb71
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-17 16:55:51 +00:00
Mårten Nordheim
0cc11596c1 Work around glibc bug in our mdns resolution
glibc has a system where, if it fails to perform Happy Eyeballs host
name resolution in parallel, it will do it sequentially.
We triggered this because our docker setup was not responding to
systemd-resolved's AAAA queries over IPv6.
The bug in glibc was then that it would poll for 4999ms after sending
the first of the two queries. __Every time__ we do mdns host lookup.
In tst_QTcpSocket this happens multiple times in ::initTestCase for the
proxy global-datatags. That means we would be stuck polling for
4999ms*5 (number of proxy addresses to look up) before every test-case
that would use proxy (even if the test just does a return in the
proxy-case). Plus another 4999ms for any mdns lookup we would need to
perform during the test.
This led to the test severely slowing down and timing out quite often.

Work around this by doing full mDNS before trying DNS.
This will let us resolve multi-label mDNS addresses.

Fixes: QTBUG-107696
Change-Id: I26c6b356b4c9712f4ac6d3613998ee448c0ca504
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 5c6814fb18)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-16 08:44:01 +00:00
Qt Submodule Update Bot
f6b1bf3c96 Update submodules on '6.5 in qt/qt5'
Change-Id: Ied967cd3e11fa7d9544aae0561fe3e22b8e195f3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-14 04:37:02 +00:00
Samuli Piippo
cf2184002d Add lz4 for yocto builds
Change-Id: I2c612805c32b66ffb18d477b2cf7f098fcd5b05b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 16af6ab94a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-14 04:36:58 +00:00
Samuli Piippo
f932c386aa Add /usr/bin/python to Ubuntu 22.04
Needed in yocto builds:
 /usr/bin/env: ‘python’: No such file or directory

Change-Id: I39cd0c507ba0bd8dd349ffdfffdb53d78a048955
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit ccc414c844)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-13 18:54:09 +00:00
Heikki Halmet
6e655d52e3 Provisioning: Install OpenSSL 3 for Red Hat 8.4
Pick-to: dev
Task-number: QTQAINFRA-4889
Change-Id: Iae783e66a3f4b1421993c5db746bd44a1ef81dd4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-02-13 05:32:53 +00:00
Samuel Mira
fe2271bba3 Enable ffmpeg for Android
After ffmpeg was removed on Android targets following QTBUG-110172,
this patch enables it after fixing the failing test.

Task-number: QTBUG-110453
Change-Id: I5598a9b72d06af6664455e933129a08192afac15
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit b9c2512748)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-12 16:52:42 +00:00
Heikki Halmet
cd22843cae Replace Ubuntu 20.04 with Ubuntu 22.04
Libclang version is built with Ubuntu 22.04 on it, others still
keep old one which is built with Ubuntu 20.04.

Task-number: QTQAINFRA-4926
Change-Id: I47bb49c1efecab6863ae52d3acf7eb47bdc47c35
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 64b24b0d85)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-12 16:36:23 +00:00
Konrad Kujawa
aa520141a0 Set OPENSSL_ROOT_DIR for gRPC unix provisioning script
Change-Id: I44fb0f94f183ddc10399c331e8e1a38c533dcf0d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 5a1ed71917)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-02-12 16:36:22 +00:00
Heikki Halmet
e2935f2068 Provisioning: Update Docker
This change will upgrade docker-compose version to v2.15.1
Also 'containerd', 'docker-ce' and 'docker-ce-cli' versions will be
upgraded to support newer Ubuntu version (20.04)

Task-number: QTQAINFRA-5396
Change-Id: I282a1cbc5870db765409985983d29f57936d1798
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 739cc29b77)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-10 09:04:41 +00:00
Fabian Kosmale
fe3876517f Enable C++20 standard for Windows developer builds
Gives more CI coverage against build failures.

Task-number: QTQAINFRA-4117
Task-number: QTQAINFRA-4242
Change-Id: I64e476cbbb74bde861fa85c677bcdc7ca91dac2d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d7795c98ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-09 18:39:56 +00:00
Assam Boudjelthia
c46c54fe7d Coin: bump Android platform sdk and build tools version to 33
Use latest platform and build tools to be able to build for Android 13.

Change-Id: I00bd9948f528d398d471e91de1d22954d786be29
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 8abebe23ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-03 21:30:44 +00:00
Qt Submodule Update Bot
270ce23a1b Update submodules on '6.5 in qt/qt5'
Change-Id: If2bb0a60d7df472139889f4241b6799c1b6539ed
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-02-03 09:22:18 +00:00
Jani Heikkinen
09fc2df086 Qt6: Remove 'TP' status from qtquick3dphysics from Qt 6.5 ->
qtquick3dphysics will be officially supported module form Qt 6.5 ->
so change the status in .gitmodules from preview to addon

Task-number: QTBUG-107387
Change-Id: Ic117f4cf3e99e4a2f59bd84aa14979419a3533b9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 172ca715e6)
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
2023-02-02 10:02:32 +02:00
Simo Fält
5271768423 Provisioning: Update Python3 from 3.7 to 3.8
Change-Id: I0884e87fbc56e4e1060406b2fc214b33c40c475c
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit 5b22f8ec2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-01 08:15:52 +00:00
Heikki Halmet
3917d45ac1 Add additional target for Red Hat 9.0 x86_64
We need to keep Red Hat 8.4 or 8.6 for packaging target and for
Android targets at the moment. If we switch to use RHEL 9
it will cause problems with GLIBC with older distros.

Let's add additional target for Red Hat 9 without packaging flag
to catch the issues

Task-number: QTQAINFRA-5111
Change-Id: I3056a820cfdf61fc307cbd07f561afe31ad689f7
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 3831a11120)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-27 14:49:32 +00:00
Heikki Halmet
bdc867146a Remove ffmpeg for Android 12
This is causing autotest failures in multimedia.

Pick-to: dev
Task-number: QTBUG-110453
Change-Id: I0c974b7faa6f0a434e65782f22984b532673dea3
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-25 19:23:25 +00:00
Artem Dyomin
397f2dadd4 Fix missing ffmpeg for desktop Linux CI platforms
What's done:
- ffmpeg build added to OpenSuse platforms
- installing of yasm moved to packages install file in
  order to get rid of OS checkings

Change-Id: I256f19a03e7f01d27923b083b63d9a6b6a5f29b4
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit e5cf7b2d58)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-25 09:28:53 +00:00
Heikki Halmet
394f69b2cd Fix template name for RHEL-9 in qtcreator.yaml
Change-Id: Ib2dcb3549e97d27aaae8522094b2602350cf2ecd
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
(cherry picked from commit 72eb1b1a5d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-25 08:29:02 +00:00
Qt Submodule Update Bot
35b888aae5 Update submodules on '6.5 in qt/qt5'
Change-Id: Ie9b0a73a909591cc52a5489f7bbcb3a8555c2829
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-24 07:06:14 +00:00
Heikki Halmet
7051182f20 Remove ffmpeg for Android
This is causing autotest failures in multimedia.

Pick-to: dev 6.4
Task-number: QTBUG-110453
Change-Id: I1eacd8eec72d4f17f7f18df9f70c07bbecc0d48b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-23 09:37:53 +00:00
Heikki Halmet
70405cddba Fix path of OPENSSL_ANDROID_HOME
Pick-to: dev 6.4
Change-Id: I910cc6695381d870d21b5775d19a76db2d19cf73
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2023-01-23 09:37:41 +00:00
Heikki Halmet
7ac39979ce Revert back to use RHEL 8.4 with Android targets
RHEL-9 is causing problems in QtApplicationmanager when using
RHEL-8.4 as a host build: It can't load libcrypto in Android
build phase

Pick-to: dev 6.4
Task-number: QTBUG-110172
Change-Id: I6d5ef4684fb11e384eb54f9a37bd30e4ef8d145b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-23 09:37:35 +00:00
Heikki Halmet
6f1b182a6d Add OpenSSL to the PATH for linux targets
This is required by QtApplicationmanager with openSUSE target

Pick-to: dev 6.4
Change-Id: Ia27353d56c162461eb7f38700cd0ea56cce16e6b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-19 10:44:44 +00:00
Heikki Halmet
3dcb6abcec Fix Id for Windows 11 arm64 target
Change-Id: I68f751b33a0ea23f674c7ce4e63da9de830305cf
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit c3d5a51de4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-18 19:34:56 +00:00
Toni Saario
a1f6cacd33 Fix ubuntu 20 id in precheck yaml
Amends 92ae8eb4ca

Change-Id: I098a45856ab3197d180c58dd595a790f1b7a1fc0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit bcf5c6680c)
2023-01-18 09:43:57 +02:00
Artem Dyomin
3624ce9c5e Update ffmpeg version to 5.1 for desktop platforms
Some issues have been fixed in ffmpeg 5.1, e.g, with videotoolbox.
So the update at least fixes our playback
of some video formats on macos, e.g. provided in the related bug.

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

Task-number: QTBUG-98102
Change-Id: I72f45780e1c3983d6a1941db2b833b78784b90de
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 0f8eccdfc5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-17 17:56:29 +00:00
Heikki Halmet
1759420acc Change RHEL 9.0 to RHEL 8.4 for packaging targets
RHEL 9 is causing glibc issue with older linux distros.
Let's revert back to use the older RHEL version.
For Android targets we can still use RHEL 9

Pick-to: dev
Task-number: QTBUG-110172
Change-Id: I6d61a550fceaab4946e27bd8806263ccfa38a6e6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-17 10:25:49 +00:00
Heikki Halmet
252c7ae303 Start using OpenSSL 3.0.7 in CI
Task-number: QTQAINFRA-4889
Change-Id: I3e335395762710d520ca93a5996d1b21d202ed4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vladimir Minenko <vladimir.minenko@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 68a7947e42)
2023-01-16 18:57:36 +00:00
Heikki Halmet
9d9cbae102 Fix tqtc-android-automotive Id
Current id won't work when including cmake_platforms_target_android.yaml

Change-Id: I6dc488e5bf683608f567dcc2871e3c1861990e32
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a915ead6ac)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-01-16 18:57:33 +00:00
Heikki Halmet
7630a1cc57 Add ID for all targets
All targets should have ID. This way it's easier to refer to needed
target

Change-Id: I0af8399c3a4c436ab1e778ab4396c65ccd3a373b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 92ae8eb4ca)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2023-01-16 18:57:31 +00:00
Qt Submodule Update Bot
929e64d8ec Update submodules on '6.5 in qt/qt5'
Change-Id: I34fb5c1f8a2e8c4b01feb6df30d66ac46ded5003
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-14 02:59:46 +00:00
Heikki Halmet
fdcfc85397 Provisioning: Add Docker for macOS
Needed by RTA tests

Task-number: QTQAINFRA-5171
Change-Id: I26ac10421ba32d68ffdef523fd97f710cd6bcaab
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit e266a9e604)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-13 02:49:26 +00:00
Samuel Mira
a70a2788f3 Provision FFmpeg library for Android
Fixes: QTBUG-100474
Change-Id: I5cc6f645bd020628bc6a77d4a5d42575f4fcf979
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit f412e6f1d1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-12 08:33:42 +00:00
Simo Fält
8ed720b5dd Provisioning: Update default python3 version in win
Change amends 95e9f8da9a after new
version of win templates were introduced.

Change-Id: Idd370025201c66e3da5a3bde71573ad8461c4164
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit ab2ec09a76)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-06 14:29:17 +00:00
Qt Submodule Update Bot
db06782007 Update submodules on '6.5 in qt/qt5'
Change-Id: I006bcd82024387294c2c031221eabe2a79e9c6ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-06 04:01:35 +00:00
Heikki Halmet
eaf033305c Provisioning: Upgrade Xcode version to 14.2 for macOS 12 & 13
Change also upgrades command line tools

Change-Id: I6cdceba07dcecf5b0be394dc147c16e084800763
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit eb0dd02a4a)
2023-01-03 10:14:17 +00:00
Heikki Halmet
d2770134a5 Add RHEL 9 to CI
This will replace RHEL 8

Task-number: QTQAINFRA-5111
Change-Id: Ib65e9b7a2afa85418d5113261bc83ba915b2bce0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 5880c423c8)
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-01-03 10:14:17 +00:00
Qt Submodule Update Bot
4b5e5a6cbb Update submodules on '6.5 in qt/qt5'
Change-Id: I2770ebaab322dafd2874d12be55e9b9479f683af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-03 03:43:26 +00:00
Heikki Halmet
430ad49cc6 Change to use sha256 signed opengl32 mesa dll files
Task-number: QTBUG-108774
Change-Id: I7d2716aa23215b783365c293c968aeeef6626126
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 1fd2a26492)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-03 01:38:06 +00:00
Qt Submodule Update Bot
9cade4393f Update submodules on '6.5 in qt/qt5'
Change-Id: Ia8c293e479163e50f82a2ca6c58f98b63cd2999b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-30 16:26:59 +00:00
Simo Fält
af2cb2edc4 Provisioning: Update default python3 version
Removing python3.6 and replacing it with more recent versions.

Change-Id: If8cd4c369e4fc9ff8dc7d53865b80b588f278091
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 95e9f8da9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-12-29 15:46:03 +00:00
Qt Submodule Update Bot
829cdbe4c8 Update submodules on '6.5 in qt/qt5'
Change-Id: I5a0020081d96eb2ae2de2f845a1067ce56b96277
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-29 12:23:59 +00:00
Qt Submodule Update Bot
435d3d93e7 Update submodules on '6.5 in qt/qt5'
Change-Id: I494a67dd1dbb9848a97c2346204eb7682e910756
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-28 21:21:17 +00:00
Morten Sørvig
4ee1668f46 wasm: update emscripten to 3.1.25
Qt 6.5 will require emscripten 3.1.25

Change-Id: I23e0d0b6951a4d69aa431710114ec2c06f7afcc3
Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-12-28 11:22:31 +01:00
Qt Submodule Update Bot
d0b83ce01d Update submodules on '6.5 in qt/qt5'
Change-Id: Ibd66204695ee87f648a950d5affdc181c337d4d2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-26 23:59:12 +00:00
Qt Submodule Update Bot
d2e198c573 Update submodules on '6.5 in qt/qt5'
Change-Id: Ie72ddc0ff21f4d2cc2ef6dc4acc07a73b9d04cc8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-24 03:39:49 +00:00
Qt Submodule Update Bot
378d3e3548 Update submodules on '6.5 in qt/qt5'
Change-Id: I82a154c925dcd91c8571eb3a77d41ab066876d07
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-17 05:25:08 +00:00
Qt Submodule Update Bot
8d06a5f76f Update submodules on '6.5 in qt/qt5'
Change-Id: I4291dd079f52e7c3f201363e0a61955e04a0324f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-15 04:48:36 +00:00
Jani Heikkinen
b30ea9dcf5 Adjust submodule branches
Change-Id: I8a267511cbb8fa63bb1e8e99d9cfbf66523fef9e
2022-12-13 07:52:52 +02:00
298 changed files with 1336 additions and 2610 deletions

5
.gitignore vendored
View File

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

91
.gitmodules vendored
View File

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

View File

@@ -12,12 +12,7 @@ include("${__qt6_qtbase_src_path}/.cmake.conf")
# Run platform auto-detection /before/ the first project() call and thus
# before the toolchain file is loaded.
# Don't run auto-detection when doing standalone tests. In that case, the detection
# results are taken from either QtBuildInternals or the qt.toolchain.cmake file.
if(NOT QT_BUILD_STANDALONE_TESTS)
include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
endif()
include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
project(Qt
VERSION "${QT_REPO_MODULE_VERSION}"
@@ -29,6 +24,8 @@ project(Qt
# Required so we can call ctest from the root build directory
enable_testing()
set(qt_module_prop_prefix "__qt_prop_")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
if (NOT QT_BUILD_STANDALONE_TESTS)
list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake")

View File

@@ -9,8 +9,8 @@ System requirements
-------------------
* C++ compiler supporting the C++17 standard
* CMake
* Ninja
* CMake 3.16 or newer
* Ninja 1.8 or newer
* Python 3
For more details, see also https://doc.qt.io/qt-6/build-sources.html

View File

@@ -1,12 +1,7 @@
# This script is to be called (ideally from a git-sync-to alias script):
# cmake -DSYNC_TO_MODULE="$1" -DSYNC_TO_BRANCH="$2" -P cmake/QtSynchronizeRepo.cmake
# Or as follows (ideally from a git-qt-foreach alias script):
# cmake -DQT_FOREACH=TRUE "-DARGS=$*" -P cmake/QtSynchronizeRepo.cmake
cmake_policy(VERSION 3.16)
include(cmake/QtTopLevelHelpers.cmake)
if(QT_FOREACH)
qt_internal_foreach_repo_run(ARGS ${ARGS})
else()
qt_internal_sync_to(${SYNC_TO_MODULE} ${SYNC_TO_BRANCH})
endif()
qt_internal_sync_to(${SYNC_TO_MODULE} ${SYNC_TO_BRANCH})

View File

@@ -421,87 +421,3 @@ function(qt_internal_sync_to module)
endforeach()
endwhile()
endfunction()
# Runs user specified command for all qt repositories in qt directory.
# Similar to git submodule foreach, except without relying on .gitmodules existing.
# Useful for worktree checkouts.
function(qt_internal_foreach_repo_run)
cmake_parse_arguments(PARSE_ARGV 0 arg
""
""
"ARGS"
)
if(NOT arg_ARGS)
message(FATAL_ERROR "No arguments specified to qt_internal_foreach_repo_run")
endif()
separate_arguments(args NATIVE_COMMAND "${arg_ARGS}")
# Find the qt repos
qt_internal_find_modules(modules)
# Hack to support color output on unix systems
# https://stackoverflow.com/questions/18968979/how-to-make-colorized-message-with-cmake
execute_process(COMMAND
/usr/bin/tty
OUTPUT_VARIABLE tty_name
RESULT_VARIABLE tty_exit_code
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set(color_supported FALSE)
set(output_goes_where "")
if(NOT tty_exit_CODE AND tty_name)
set(color_supported TRUE)
set(output_goes_where "OUTPUT_FILE" "${tty_name}")
endif()
# Count successes and failures.
set(count_success "0")
set(count_failure "0")
# Show colored error markers.
set(color "--normal")
if(color_supported)
set(color "--red")
endif()
foreach(module IN LISTS modules)
message("Entering '${module}'")
execute_process(
COMMAND ${args}
WORKING_DIRECTORY "${module}"
${output_goes_where}
RESULT_VARIABLE cmd_result
)
if(cmd_result)
math(EXPR count_failure "${count_failure}+1")
# cmake_echo_color is undocumented, but lets us output colors and control newlines.
execute_process(
COMMAND
${CMAKE_COMMAND} -E env CLICOLOR_FORCE=1
${CMAKE_COMMAND} -E cmake_echo_color "${color}"
"Process execution failed here ^^^^^^^^^^^^^^^^^^^^"
)
else()
math(EXPR count_success "${count_success}+1")
endif()
endforeach()
# Show summary with colors.
set(color "--normal")
if(count_failure AND color_supported)
set(color "--red")
endif()
message("\nSummary\n=======\n")
execute_process(
COMMAND
${CMAKE_COMMAND} -E cmake_echo_color --normal --no-newline "Failures: "
)
execute_process(
COMMAND
${CMAKE_COMMAND} -E env CLICOLOR_FORCE=1
${CMAKE_COMMAND} -E cmake_echo_color "${color}" "${count_failure}"
)
message("Successes: ${count_success}")
endfunction()

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,11 @@
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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -8,6 +8,7 @@ Configurations:
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]

View File

@@ -12,7 +12,7 @@ Configurations:
Id: 'ubuntu-22.04-documentation'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests', 'Insignificant']
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure', 'DoNotRunTests']
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
-
@@ -30,7 +30,7 @@ Configurations:
Id: 'ubuntu-22.04-documentation-x11-tests'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'TestDocs', 'TestOnly', 'InsignificantTests']
Features: ['Sccache', 'TestOnly']
Platform dependency: 'ubuntu-22.04-documentation'
-
Id: 'ubuntu-22.04-x11-tests'
@@ -46,6 +46,7 @@ Configurations:
Configure arguments: '-nomake examples -developer-build'
Environment variables: [
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
@@ -61,33 +62,34 @@ Configurations:
]
-
Id: 'windows-10_22h2-msvc2019'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-11_22h2-msvc2019'
Template: 'qtci-windows-11_22H2-x86_64-51'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-10_22h2-msvc2022'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -100,7 +102,7 @@ Configurations:
]
-
Id: 'windows-11_22h2-msvc2022'
Template: 'qtci-windows-11_22H2-x86_64-51'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -113,19 +115,20 @@ Configurations:
]
-
Id: 'windows-10_22h2-msvc2019-developer-build'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-10_22h2-msvc2019-arm64'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
@@ -133,7 +136,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}}',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
@@ -142,7 +146,7 @@ Configurations:
]
-
Id: 'windows-11_22h2-msvc2019-developer-build'
Template: 'qtci-windows-11_22H2-x86_64-51'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
@@ -154,7 +158,7 @@ Configurations:
]
-
Id: 'windows-11_22h2-msvc2019-arm64'
Template: 'qtci-windows-11_22H2-x86_64-51'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
@@ -162,19 +166,21 @@ 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',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'rhel-8.6'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Id: 'rhel-8.4'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF'
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
-
Id: 'rhel-9.0'
@@ -184,21 +190,12 @@ Configurations:
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
-
Id: 'debian-11.6-arm64'
Template: 'qtci-linux-Debian-11.6-aarch64-50'
Compiler: 'GCC'
Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
]
-
Id: 'ios-universal'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-12-x86_64-105'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
@@ -207,98 +204,77 @@ Configurations:
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
]
-
Id: 'windows-10_22h2-mingw11'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Mingw'
Features: ['Packaging', 'Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
]
-
Id: 'windows-10_22h2-llvm'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Clang'
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
'LLVM_INSTALL_DIR=C:\llvm-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
]
-
Id: 'windows-11_22h2-llvm'
Template: 'qtci-windows-11_22H2-x86_64-51'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'Clang'
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
'LLVM_INSTALL_DIR=C:\llvm-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
]
-
Id: 'windows-10_22h2-mingw11-developer-build'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples'
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
]
-
Id: 'windows-11_22h2-mingw11-developer-build'
Template: 'qtci-windows-11_22H2-x86_64-51'
Template: 'qtci-windows-11_22H2-x86_64-50'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples'
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
]
-
Id: 'focal-arm64-debian-pkg-packaging'
Template: 'qtci-linux-Debian-11.6-aarch64-50'
Compiler: 'GCC'
Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
Environment variables: [
'DEBIAN_RULES_REF=6.6_dev',
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
'COIN_SBUILD_CHROOT=focal-arm64-sbuild',
'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ focal main universe multiverse',
]
-
Id: 'focal-amd64-debian-pkg-packaging'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
Environment variables: [
'DEBIAN_RULES_REF=6.6_dev',
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
'COIN_SBUILD_CHROOT=focal-amd64-sbuild',
'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ focal main universe multiverse',
]

View File

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

View File

@@ -11,7 +11,7 @@ Configurations:
]
-
Id: 'windows-10_22h2-minimal-static'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'
@@ -23,7 +23,7 @@ Configurations:
]
-
Id: 'macos-11-minimal-static'
Template: 'qtci-macos-11-x86_64-106'
Template: 'qtci-macos-11-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'

View File

@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: 'android-arm64-on-macos'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-12-x86_64-105'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
@@ -12,12 +12,14 @@ Configurations:
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis 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',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}}',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
Id: 'android-armv7-on-windows'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Mingw'
@@ -28,38 +30,44 @@ Configurations:
'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',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}}',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
Id: 'android-6-x86-on-linux'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
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.6'
Platform dependency: 'rhel-8.4'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
'ANDROID_EMULATOR=@emulator_x86_api_23',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
Id: 'android-13-x86_64-on-linux'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
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.6'
Platform dependency: 'rhel-8.4'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
'ANDROID_EMULATOR=@emulator_x86_64_api_33'
]

View File

@@ -6,15 +6,14 @@ Configurations:
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'opensuse-15.4-developer-build'
Features: ['Sccache', 'DisableTests', 'UseConfigure']
Features: ['Sccache', 'DisableTests']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
"TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
-DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
]
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_thread=ON -DQT_QMAKE_DEVICE_OPTIONS="QT_EMSCRIPTEN_ASYNCIFY=1"',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
Id: 'webassembly-windows'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Target os: 'WebAssembly'
Compiler: 'Mingw'
Target compiler: 'Clang'
@@ -25,11 +24,13 @@ Configurations:
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang',
]
-
Id: 'webassembly-macos-thread'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-12-x86_64-105'
Target os: 'WebAssembly'
Compiler: 'Clang'
Target compiler: 'Clang'
@@ -38,6 +39,6 @@ Configurations:
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local',
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
]

View File

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

View File

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

View File

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

View File

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

View File

@@ -9,15 +9,16 @@ Configurations:
-
Id: 'macos-universal-on-x86_64'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
]
-
@@ -37,7 +38,7 @@ Configurations:
-
Id: 'macos-11-x86_64-tests'
Template: 'qtci-macos-11-x86_64-106'
Template: 'qtci-macos-11-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
@@ -61,7 +62,7 @@ Configurations:
Platform dependency: 'macos-universal-on-x86_64'
-
Id: 'macos-12-x86_64-tests'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-universal-on-x86_64'
@@ -73,7 +74,7 @@ Configurations:
Platform dependency: 'macos-universal-on-arm64'
-
Id: 'macos-12-arm-on-x86_64-tests'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-universal-on-arm64'
@@ -86,7 +87,7 @@ Configurations:
-
Id: 'macos-12-x86_64-developer-build'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
@@ -112,7 +113,7 @@ Configurations:
-
Id: 'macos-11-x86_64-developer-build-tests'
Template: 'qtci-macos-11-x86_64-106'
Template: 'qtci-macos-11-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-12-x86_64-developer-build'
@@ -124,7 +125,7 @@ Configurations:
Platform dependency: 'macos-12-arm64-developer-build'
-
Id: 'macos-12-x86_64-developer-build-tests'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-12-x86_64-developer-build'

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,43 @@
Version: 2
Module only: True
Include: [yocto.yaml]
Configurations: []
Configurations:
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET1'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET2'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET3'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET4'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET5'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET6'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET7'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET8'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET9'
-
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'Yocto'
Target arch: 'TARGET10'

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,13 +0,0 @@
Version: 2
Configurations:
# QTQAINFRA-5404
-
Id: 'ubuntu-20.04-c++17'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-nomake examples -release -c++std c++17 -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]

View File

@@ -0,0 +1,133 @@
Version: 2
Configurations:
-
# cmake_platforms.yaml
Id: 'ubuntu-22.04-documentation'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'UseConfigure']
Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
-
Id: 'ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
]
-
# cmake_platforms_qemu.yaml
Id: 'qemu-armv7-developer-build-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QEMU'
Target arch: 'armv7'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Features: ['Sccache']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',
]
-
Id: 'qemu-arm64-developer-build-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Features: ['Sccache']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',
]
-
Id: 'qemu-mips64-developer-build-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QEMU'
Target arch: 'mips64'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Features: ['Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',
]
-
# cmake_platforms_qemu_qnx710.yaml
Id: 'qnx-710-x86_64-developer-build-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QNX_710'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-22.04'
Features: ['Packaging', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
'QT_CMAKE_DIR=/opt/cmake-3.24.2/bin',
'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
]
-
Id: 'qnx-710-arm64-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QNX_710'
Target arch: 'arm64'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-22.04'
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
]
-
Id: 'qnx-710-armv7-on-ubuntu-22.04'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QNX_710'
Target arch: 'armv7'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'ubuntu-22.04'
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
]
-
# default.yaml
Id: 'ubuntu-22.04-license-check'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
-
# integrity.yaml
Id: 'integrity-arm64-on-ubuntu-22.04-x86_64'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Target os: 'INTEGRITY'
Platform dependency: 'ubuntu-22.04'
Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF',
'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH']

View File

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

View File

@@ -2,11 +2,11 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['DisableTests']
-
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Features: ['DisableTests']
-

View File

@@ -2,7 +2,7 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
@@ -16,7 +16,7 @@ Configurations:
Environment variables: []
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
-
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'DebugAndRelease']
Configure arguments: ''

View File

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

View File

@@ -28,24 +28,5 @@ Include: [
"integrity-arm64"
]
]
Configurations:
-
Id: 'Axivion-QEMU_build'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
Platform dependency: 'ubuntu-22.04'
Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'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 -qtlibinfix TestInfix',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
'QT_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',
]
Configurations: []

View File

@@ -27,7 +27,8 @@ Include: [
Configurations:
-
Id: 'macos-latest-xcode-universal-static-build'
Template: 'qtci-macos-12-x86_64-106'
Template: 'qtci-macos-12-x86_64-105'
Target os: 'MacOS_12_Static'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -36,17 +37,20 @@ Configurations:
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
]
-
Id: 'Linux-RHEL_8_6_Static'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Id: 'Linux-RHEL_8_4_Static'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'RHEL_8_4_Static'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
]
-
Id: 'Windows-MSVC2019_Static'
Template: 'qtci-windows-10_22H2-x86_64-51'
Template: 'qtci-windows-10_22H2-x86_64-50'
Target os: 'Windows_10_Static'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql -plugin-sql-sqlite -plugin-sql-odbc'

View File

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

View File

@@ -1,35 +1,61 @@
Version: 2
Include: [
cmake_platforms.yaml: [
'rhel-8.6',
'windows-10_22h2-mingw11',
'ubuntu-22.04-documentation',
'ubuntu-22.04-documentation-x11-tests'
],
macos.yaml: [
'macos-universal-on-x86_64'
],
cmake_platforms_target_android.yaml: [
'android-arm64-on-macos',
'android-armv7-on-windows',
'android-6-x86-on-linux',
'android-13-x86_64-on-linux'
]
]
Include: [ cmake_platforms_target_android.yaml ]
Configurations:
-
Id: 'automotive-ubuntu-22.04-documentation'
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
-
Id: 'windows-10_22h2-mingw11'
Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Mingw'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
]
-
Id: 'macos-universal-on-x86_64'
Template: 'qtci-macos-12-x86_64-105'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF',
'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
]
-
Id: 'rhel-8.4'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', '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/linux-x86_64-gcc'
]
-
Id: "automotive-android-x86-on-linux"
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
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.6'
Platform dependency: 'rhel-8.4'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'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,4 +0,0 @@
Version: 2
Module only: True
Include: [meta-boot2qt.yaml]
Configurations: []

View File

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

View File

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

View File

@@ -1,63 +0,0 @@
### RED HAT ENTERPRISE LINUX 8.6 ###
Language: English (United States)
Time & Date: Etc/Coordinated Universal Time
Software Selection: Server with GUI
Installation Destination: Automatic partitioning selected
Root Passowrd: Set
Network & Host..: Connect
User Creation
Beging Installation
Reboot
Licensing: Accept
Finish Configuration
gnome-initial-setup:
Language: English (US)
Typing:English (US)
Privacy: Location Services: OFF
Connect Your Online Accounts: Skip
Start Using Red Hat Enterprise Linux
# Add user to sudoers
Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
# Configure Settings
Notifications:
* Notification Popups: OFF
* Lock Screen Notifications: OFF
Privacy:
* Screen Lock: OFF
Power:
* Blank screen: Never
Details:
* Time & Date: Time Zone: UTC
* run "sudo timedatectl set-timezone Etc/UTC"
* Users: Automatic login on
Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
sudo grub2-mkconfig -o /etc/grub2.cfg
sudo grub2-mkconfig -o /boot/grub2/grub.cfg
# Add support for virtio driver
su
echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
dracut -f
# Do these from Opennebula UI!
# Enable network connection from right upper corner
Devices:
* Displays: Resolution 1280 x 800
# Fetch and run coin-setup
Download http://coin/coin/binary/linux_amd64/coin-setup
# run as qt user
su
chmod 755 coin-setup
run './coin-setup'
Reboot

View File

@@ -1,5 +1,5 @@
### Visual Studio 2019 ###
Visual Studio 2019 version 16.11.27 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__505064367.1547034421.exe
Visual Studio 2019 version 16.11.20 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe
Installed MSVC-2019 Components:
@@ -66,7 +66,7 @@ Windows 11 SDK (10.0.22000.0)
############################################################
### Visual Studio 2019 build tools ###
Visual studio 2019 build tools version 16.11.27 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
Visual studio 2019 build tools version 16.11.20 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
* Only default installation, no additional selections
############################################################

View File

@@ -1,5 +1,5 @@
### Visual Studio 2022 Official release ###
Visual Studio 2022 version 17.6.4 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
Visual Studio 2022 version 17.3.6 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
Installed MSVC-2022 Components:
@@ -61,7 +61,7 @@ Windows Universal C Runtime
############################################################
### Visual Studio 2022 build tools ###
Visual studio 2022 build tools version 17.6.4 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
Visual studio 2022 build tools version 17.3.6 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
* Only default installation, no additional selections
############################################################

View File

@@ -1,6 +1,5 @@
### Visual Studio 2019 ###
Visual Studio 2019 version 16.11.19 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__505064367.1547034421.exe
Visual Studio 2019 was updated to version 16.11.27 with Visual Studio Installer
Visual Studio 2019 version 16.11.19 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe
Installed MSVC-2019 Components:
@@ -69,7 +68,6 @@ Windows 11 SDK (10.0.22000.0)
Visual studio 2019 build tools version 16.11.19 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
* Only default installation, no additional selections
Visual studio 2019 build tools were updated to version 16.11.27 with Visual Studio Installer
############################################################
### Debugging tools ###

View File

@@ -1,6 +1,5 @@
### Visual Studio 2022 Official release ###
Visual Studio 2022 version 17.3.5 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
Visual Studio 2022 was updated to 17.6.4 vith Visual Studio Installer
Visual Studio 2022 version 17.3.5 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
Installed MSVC-2022 Components:
@@ -64,8 +63,6 @@ Windows Universal C Runtime
Visual studio 2022 build tools version 17.3.5 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
* Only default installation, no additional selections
Visual Studio 2022 build tools were updated to 17.6.4 vith Visual Studio Installer
* Some of the installed framework versions are out of support and do not get any security updates
############################################################
### Debugging tools ###

View File

@@ -70,8 +70,8 @@ toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
ndkSha1Default=$ndkSha1Latest
# Android automotive
sdkApiLevelAutomotive="android-30"
androidAutomotive11Url="$basePath/${sdkApiLevelAutomotive}_automotive.tar.gz"
sdkApiLevelAutomovie="android-30"
androidAutomotive11Url="$basePath/${sdkApiLevelAutomovie}_automotive.tar.gz"
androidAutomotive="android-automotive"
android11Sha="4a5cd2bea7ce323b724c3ff1faab13d99f9d2be9"
@@ -169,12 +169,12 @@ echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -c 2048M -f \
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_33 -c 2048M -f \
-k "system-images;android-33;google_apis;x86_64"
echo "Install $sdkApiLevelAutomotive $androidAutomotive"
echo "Install $sdkApiLevelAutomovie $androidAutomotive"
DownloadURL "$androidAutomotive11Url" "$androidAutomotive11Url" "$android11Sha" \
"/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz"
sudo tar -xzf "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz" -C $sdkTargetFolder/system-images
"/tmp/${sdkApiLevelAutomovie}_automotive.tar.gz"
sudo tar -xzf "/tmp/${sdkApiLevelAutomovie}_automotive.tar.gz" -C $sdkTargetFolder/system-images
echo "no" | ./avdmanager create avd -n automotive_emulator_x86_api_30 -c 2048M -f \
-k "system-images;${sdkApiLevelAutomotive};${androidAutomotive};x86"
-k "system-images;${sdkApiLevelAutomovie};${androidAutomotive};x86"
# Purely informative, show the list of avd devices
./avdmanager list avd

View File

@@ -1,81 +0,0 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2023 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 3 as published by the Free Software
## Foundation and appearing in the file LICENSE.LGPL3 included in the
## packaging of this file. Please review the following information to
## ensure the GNU Lesser General Public License version 3 requirements
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 2.0 or (at your option) the GNU General
## Public license version 3 or any later version approved by the KDE Free
## Qt Foundation. The licenses are as published by the Free Software
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
## https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
#############################################################################
# This script installs Axivion Bauhaus Suite tool.
set -ex
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
# source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
DownloadAndExtract () {
url=$1
sha=$2
file=$3
DownloadURL "$url" "$url" "$sha" "$file"
tar -xzvf $file
rm -rf $file
}
# Axivion Bauhaus Suite
sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_6_0-wavefront-2023-03-16-x86_64-gnu_linux.tar.gz"
targetFile="bauhaus-suite-7_6_0-wavefront-2023-03-16-x86_64-gnu_linux.tar.gz"
sha1="20bfa8872b90ff11394098a833d536229425535e"
cd $HOME
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"
mkdir $HOME/.bauhaus
cd "$HOME/.bauhaus"
wget http://ci-files01-hki.ci.qt.io/input/axivion/Qt_Evaluation_20231231.key
cd $HOME
#Axivion configuration
configurationFile="http://ci-files01-hki.ci.qt.io/input/axivion/axivion_config.tar.gz"
configurationTargetFile="axivion_config.tar.gz"
configSha1="f3aa53f253fa00c7f3fa64e9fe55aa7f93bc5377"
DownloadAndExtract "$configurationFile" "$configSha1" "$configurationTargetFile" "$HOME"
echo "Axivion Bauhaus Suite = 7.6.0_wavefront-2022-03-16" >> ~/versions.txt

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