Commit Graph

5304 Commits

Author SHA1 Message Date
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