Commit Graph

5378 Commits

Author SHA1 Message Date
Heikki Halmet
268cb978e2 Provisioning: Upgrade ffmeg version to fix make issue with SLES
Version points to commit:
c5039e158d20e85d4d8a2dee3160533d627b839a

This commit is the latest one in 6.0 branch. This way we'll get
fix also for https://fftrac-bg.ffmpeg.org/ticket/10405

Version should be changed to official release
when the next official release is available.

Task-number: QTQAINFRA-5912
Change-Id: I4e7acea5a54ce692334c7fe22ba074791c94cf03
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 4067395aee)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2024-01-27 14:57:31 +00:00
Qt Submodule Update Bot
f0d618aa7a Update submodules on '6.5 in qt/qt5'
Change-Id: Ic6a7d670a88d93458c19b4dbfa427dfc7959dc2f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-13 01:00:34 +00:00
Heikki Halmet
0402ddbe3a Add macOS 13 x86_64 to CI as build and test target
macOS 12 x86_64 will be replace with macOS 13. Tests will be still run
on macOS 12

Let's keep same Xcode version (14.2) than older macOS (12) has

Task-number: QTBUG-104210
Change-Id: If3e06834156196917001f83ca391a66a6c78e84a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit ac33d86e9a)
2023-10-12 09:43:59 +00:00
Qt Submodule Update Bot
6b82ba8aff Update submodules on '6.5 in qt/qt5'
Change-Id: I64498b803a0910f098db7705b1cac7cfbb4db9b7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-11 06:53:52 +00:00
Ville-Pekka Karhu
f56ba698b2 Provisioning: Add missing macOS 13 Intel files
Change-Id: I93ac1239a566980c3ac4e8054a83d4006d0db288
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-10-10 17:45:41 +03:00
Qt Submodule Update Bot
3ceab0b1f6 Update submodules on '6.5 in qt/qt5'
Change-Id: Ic65aa3777734c4b8c36c720d20d9af5fd44289b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-09 22:32:17 +00:00
Samuli Piippo
79ec436150 Add libusb to aarch64 debian
Needed by QDB.

Task-number: QTBUG-114257
Change-Id: I4f17c4fda628e7fd58c71fb088d940dc14dce89a
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit f68c116871)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7e4cfd74f0)
2023-10-09 12:19:09 +00:00
Qt Submodule Update Bot
456a77d958 Update submodules on '6.5 in qt/qt5'
Change-Id: I73fa86c404b9d7f6a155a13081ed63276f5c0ee6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-05 19:48:59 +00:00
Qt Submodule Update Bot
ef13251934 Update submodules on '6.5 in qt/qt5'
Change-Id: Id68e3851b3b18ab814dfb7a1730ac77470e5c534
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-04 16:44:28 +00:00
Qt Submodule Update Bot
d2b162d2e6 Update submodules on '6.5 in qt/qt5'
Change-Id: I799eb39baeb56443be3e8ce6d86ed445a64d4c30
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-10-03 06:08:44 +00:00
Elias Toivola
ed499857b4 Fix FFmpeg nv-codec file SHA and cache
External URL file SHA changed and the cache file didn't exist.

Pick-to: 6.5.3
Task-number: QTQAINFRA-5862
Change-Id: Ib4670d367d6541e67eb54dd3fb84079548b13722
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit bbbe558077)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 710d6e5cb0)
2023-10-02 05:17:10 +00:00
Simo Fält
b041acefe6 IFW: Enable static build on Linux
It seems the RHEL can't detect static openssl libs among the
shared libs, so we need to install additional version of
openssl, where we have only archives.

Task-number: QTIFW-3158
Change-Id: I0c65da6f3c3f9ed2e9c627390622b81dccd36bf6
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2023-09-28 07:12:04 +00:00
Simo Fält
703af6a36f IFW: Fix cmake args for static building on Windows
Task-number: QTIFW-3158
Change-Id: Ifd8a179e65b758089c2274fdf887d6f4f041afcb
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2023-09-28 07:12:02 +00:00
Safiyyah Moosa
f3b2983537 Doc: Create README template
There are many Qt submodules, and it would be beneficial to users if
there was a standard README template that will enable them to understand
and access the submodule content better. Currently many of the
submodules do not have README documents, or if they do, each submodule
varies vastly regarding what content is in the document. This proposed
README template is based on the Git ReadMe structure.

Task-number: QTBUG-114809
Change-Id: I3d1d1da27ed665e76ee6d1df8a93c3e5a920b0a3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
(cherry picked from commit 80573dd36b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9e6717ed6b)
2023-09-23 16:20:25 +00:00
Qt Submodule Update Bot
01a918b4d2 Update submodules on '6.5 in qt/qt5'
Change-Id: I3368fc83b3d58d4c394b8d688e3e9e165a21b790
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-22 19:08:10 +00:00
Qt Submodule Update Bot
b9965491d8 Update submodules on '6.5 in qt/qt5'
Change-Id: Ie2a126fa530c503c5a4f44cd2ef6f450ce7ac32c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-21 15:28:53 +00:00
Ville-Pekka Karhu
31cf8010bc Replace macOS 12 ARM with macOS 13 ARM as a build target
Change-Id: I3c05bf3d33e3360b453417f48e7c7575abde837b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 7863f9974c)
2023-09-21 08:12:20 +00:00
Marc Mutz
c126b830dc nightly_ubuntu_22_04_xwayland: drop -no-warnings-are-errors
I can see why de8a8879bd added
-no-warnings-are-errors (QtWayland tests were full of [=] implicitly
capturing *this), but I've fixed those now, so re-add -Werror.

Change-Id: I48db4cee08bd766b2b00949cdb09a4dd97214298
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit bfb6538af8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-09-20 07:29:38 +00:00
Qt Submodule Update Bot
a59b1c8fc8 Update submodules on '6.5 in qt/qt5'
Change-Id: If5c36509c8d3e5aa3f3097688eeb9c1f5d418043
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-20 03:54:06 +00:00
Qt Submodule Update Bot
b74d624f5f Update submodules on '6.5 in qt/qt5'
Change-Id: I3b65b8b7650e33801268bb90db9d0bfd871b1815
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-18 17:35:04 +00:00
Lucie Gérard
9de92ca46a Add license header to provisioning scripts missing one
Task-number: QTBUG-108364
Change-Id: I5b1d53aad917ed38f9e26e1fcc1b97b921c0603a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit ae21de72f3)
2023-09-14 19:42:16 +02:00
Qt Submodule Update Bot
f9a60ca918 Update submodules on '6.5 in qt/qt5'
Change-Id: Ifd0847ba3e1d9cce04c3d591f458ec1660ab002f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-14 14:47:55 +00:00
Qt Submodule Update Bot
b05cd1866a Update submodules on '6.5 in qt/qt5'
Change-Id: Ic7595098ab2b4958e0c3720592d4b7bdaf6e5b23
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-13 03:53:43 +00:00
Jani Heikkinen
e9f37bb9ec Add missing optional dependency for qtgrpc submodule
qtgrpc recommends qtdeclarative; add that one in .gitmodules as well;
the dependency were added in the module in
681d104f0d03f97681536d3691d170d7c06aab2b

Change-Id: I325abc8453d26cf0d75425e806e3e0e7b182070a
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 21f55b70ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-09-12 23:49:00 +00:00
Qt Submodule Update Bot
73b60e7f35 Update submodules on '6.5 in qt/qt5'
Change-Id: I9439b7d6bc2250bcedc1eaa944d3022710d08fb5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-12 10:05:23 +00:00
Assam Boudjelthia
46041bf79f Android: Add missing ANDROID_EMULATOR param to Multi-ABI test target
The Multi-ABI targets run a subset of Android tests but the target
doesn't explicitly set the name of the Android emulator to run, so it
was defaulting to Android 6 because the CI Android emulator runner
script defaults to that. The latter is going change to be more explicit,
so this needs to be explicit also.

Change-Id: Ifd5ddd5b5cf3b7a1b275f5a7b1252a21ae3165bc
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 2e96d4eefa)
2023-09-12 09:38:51 +00:00
Lucie Gérard
f477802046 Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Task-number: QTBUG-67283
Task-number: QTBUG-108364
Change-Id: If26e4d35c780db4a7982bb84872b251dad24716e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit eecfb19548)
2023-09-11 12:18:35 +02:00
Artem Dyomin
c6656a08ef Add openssl to ffmpeg linux builds
We need ffmpeg+openssl to enable multimedia networking.
We kept it disabled on linux since we had linking dependency.
The related patch in QtMM resolves openssl symbols dynamicaly
and address the mandatory dependency.

Change-Id: Idad0618a5320ae32d50fe1f3866c4ffd1bf8f542
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 7300099520)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-09-08 18:39:44 +00:00
Lucie Gérard
d902125e23 Add license directory and update remaining license format in coin
Task-number: QTBUG-108364
Change-Id: I1250a46d60d5b4e85258b93f8f6f6fc4631b3a70
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 6757a4c399)
2023-09-07 10:40:22 +02:00
Toni Saario
9d5cb5efce Add Ubuntu 22 namespace build and doc tests to default precheck
Change-Id: I42b1355406040fbf61339013294232c3f0a339fa
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 561f9e287b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-09-06 16:09:07 +00:00
Alexandru Croitor
0d527334cd CMake: Remove unused variable
Change-Id: I8f79797428226b376a21813c91c87b5bfe8b390b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit cbb50f2e0b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-09-06 10:34:35 +00:00
Simo Fält
0d080a323a Provisioning: Install missing python3 packages to Debian 11
Change-Id: Ib322d71a2af760f3cedecf73d0b51a1b15e460f6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit b1ce3549a0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-09-05 23:07:01 +00:00
Qt Submodule Update Bot
26202e7a75 Update submodules on '6.5 in qt/qt5'
Change-Id: I58998f0e7121c1fb65843f3ada23cd50c8d4b887
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-05 02:21:09 +00:00
Heikki Halmet
7ac3fe0df9 Provisioning: Install needed SW for Debian ARM IFW targets
Task-number: QTIFW-3073
Change-Id: I613b658c1ef3dbac597d8018a937a7324b582e58
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2023-09-04 11:06:21 +00:00
Qt Submodule Update Bot
4fd8c3bc6f Update submodules on '6.5 in qt/qt5'
Change-Id: I1585dc737fcd1c2c0db3af8e4e8a052def5cf29d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-01 22:10:47 +00:00
Qt Submodule Update Bot
d506ab552d Update submodules on '6.5 in qt/qt5'
Change-Id: I4906fd7193da4ec041568859f5da1ac915814cf6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-31 04:07:27 +00:00
Qt Submodule Update Bot
3a8e80cbba Update submodules on '6.5 in qt/qt5'
Change-Id: Iad5495591dee9b880849ff9fcf58c7e68b684b5c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-29 16:52:09 +00:00
Qt Submodule Update Bot
b37f66e954 Update submodules on '6.5 in qt/qt5'
Change-Id: I35d44bb58fc31a8e357ac06a61dc74e6e5756a05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-28 14:19:01 +00:00
Heikki Halmet
7d3cad0ec2 Add target for Linux on ARM
Used platform is debian 11.6

Task-number: QTIFW-3073
Change-Id: I6695362d7581ecb298a9f62cd400572a0e942b2c
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2023-08-28 08:44:50 +00:00
Artem Dyomin
5d053bd216 Add nvcodec to the ffmpeg build
The patch enables nvidia hardware encoders/decoders.
It doesn't add new package dependencies, ffmpeg loads
required functionality in runtime if nvidia drivers have been
installed.

The change is coming together with implementation of hw devices precheck
in qtmultimedia.

Change-Id: Id54a95b2bacf433950c7b50a42ff99136a143d98
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 69c29b7584)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-26 07:11:15 +00:00
Qt Submodule Update Bot
72589ec7e0 Update submodules on '6.5 in qt/qt5'
Change-Id: I8db95420fe4e2d327c2cba85b3d195f2ab4f91f9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-25 17:57:37 +00:00
Qt Submodule Update Bot
4f8eeb6ae2 Update submodules on '6.5 in qt/qt5'
Change-Id: Ibc435f1c7a42665151d673a3aab321fcdf05c7fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-24 13:16:54 +00:00
Qt Submodule Update Bot
49566bde72 Update submodules on '6.5 in qt/qt5'
Change-Id: I188e2c18cc62e6bbf106ce4ed05a8902e7b9dd31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-23 21:17:30 +00:00
Qt Submodule Update Bot
ab3169b8ea Update submodules on '6.5 in qt/qt5'
Change-Id: I5542d1a037c6347e500e5916f84943161e97028e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-22 21:04:52 +00:00
Qt Submodule Update Bot
4675eae821 Update submodules on '6.5 in qt/qt5'
Change-Id: Ia683a9c3d8360f674364e5bf88f083f1d434673d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-22 08:18:18 +00:00
Matti Paaso
d8d615259a Change Java 8 into Java 11 for Windows x86
Jenkins dropped Java 8 support and Windows x86 is still used in
packaging and RTA.

Change-Id: I001aacd38147a21944ecaa7223414226a6c500ff
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 28e1b89e42)
2023-08-22 08:18:17 +00:00
Artem Dyomin
9b827f5888 Disable vulkan and v4l2m2m for ffmpeg builds
Vulkan:
FFmpeg has a very draft support of vulkan in n5.x and n6.0,
it's promised to be introduced with some working functionality in n6.1.
We'll wait for 6.1, then test it. For now, let's get rid of the extra
dependency.

v4l2m2m:
It's a prospective hw acceleration on linux, especially on embeddded
platforms, but currently, in my experiments, it's not working with
both QtMM and ffmpeg cmd line.
Let's get rid of the not working codec. Hopefully, it'll be fixed
in the future.

Change-Id: I2468f84ae2ec54043d2db83f1a9c08be8e4f509d
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit d16fb16c53)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-18 21:55:07 +00:00
Qt Submodule Update Bot
e49526aab3 Update submodules on '6.5 in qt/qt5'
Change-Id: If3cf4530a9f3541c8cd42edf321eabc5a1e9ca46
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-16 20:25:13 +00:00
Heikki Halmet
cd2b7d5774 Add support for Installer Framework
Task-number: COIN-1050
Change-Id: I502f5b85068936624a66d1a6cf6c6c1991e088b4
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-08-15 04:02:50 +00:00
Artem Dyomin
6a799d2015 Add libvaapi to the ffmpeg build on Linux x86_64
We need to provide hw acceleration in qtmultimedia linux packages,
vaapi interface is already integrated to the module.

To be described in QtMM documentation.

Change-Id: I60fcc0b43e5800b7dc5621bfb835c72237fd9b02
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 76f4cebd21)
2023-08-14 08:46:57 +00:00