Commit Graph

5364 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
c0f82c6181 Update submodules on '6.5.3 in qt/qt5'
Change-Id: I1c5f47baa2ecdcec74dfc0bfc388aca867ca25f3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.5.3
2023-09-25 15:46:46 +00:00
Qt Submodule Update Bot
e0c366d5de Update submodules on '6.5.3 in qt/qt5'
Change-Id: I72272507b9dac98d15cecdbaf88da4eb7c25f426
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-24 15:10:20 +00:00
Qt Submodule Update Bot
5d8039f0ac Update submodules on '6.5.3 in qt/qt5'
Change-Id: Ic798ee3a3bfa25858bb66bc694fb98bd0a7db41c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-22 01:51:12 +00:00
Qt Submodule Update Bot
8a1cbf0bbd Update submodules on '6.5.3 in qt/qt5'
Change-Id: I5402d3e0a394653054aa85b061f8f34a819ddbaf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-20 07:48:31 +00:00
Qt Submodule Update Bot
d57e9c9854 Update submodules on '6.5.3 in qt/qt5'
Change-Id: I0d540ee0973d603315f35a537846af0ab9d24299
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-18 21:30:13 +00:00
Jani Heikkinen
b2a24d0f1c Adjust submodule branches
Change-Id: Ia33310d97c86fe052492322b6fa988a2085d2d68
2023-09-15 08:25:04 +03: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
Qt Submodule Update Bot
35f1dc9e3d Update submodules on '6.5 in qt/qt5'
Change-Id: Iaab5c4a542fed2afcf476bd7b00066562f35d27e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-12 05:47:48 +00:00
Ivan Solovev
92d30a74f7 Update californium docker container
The californium docker container was based on californium 1.0.0, which
is a very old release. This results in some SSL-related errors when
running the Qt CoAP tests in the CI.

This patch updates the docker container. Instead of a custom fork of
a californium server, we use 3.8.0 release tag, and apply a custom
patch locally.
A similar docker container is already uploaded to DockerHub and used
in Qt CoAP examples.

Task-number: QTBUG-114798
Change-Id: I07346f69a6790b4ae648e073440d68f28668cdd0
Reviewed-by: Sona Kurazyan <kurazyan.sona@gmail.com>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 2ed9f566c1)
2023-08-11 13:51:48 +00:00
Dominik Holland
b3f6c5b223 Provisioning: Remove the special wheel cache for python3 packages
It should be replaced with a global pip cache in the long run.
Removing it should make the maintenance of the required packages easier
as it can be done within the modules instead of in the global
provisioing scripts.

Change-Id: Ief9832a8a640ce98325cda015d0a9e89d6cb16af
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit b87b44168c)
2023-08-10 08:40:48 +02:00
Matti Paaso
7104151ebd Add tqtc-qtsdk.yaml file
Pkg Jenkins wants to use tqtc-qtsdk repository to get machines
from Coin.

Task-number: QTQAINFRA-5501
Change-Id: Ief782a4808b7484e456c6e7ca3d156aba8dabdd9
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
(cherry picked from commit 9a94ba93db)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-07 13:12:59 +00:00
Qt Submodule Update Bot
2454ddaabe Update submodules on '6.5 in qt/qt5'
Change-Id: I5bb517596e5b5f5571d76b84e27c2abe2e4a315a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-04 13:12:53 +00:00
Qt Submodule Update Bot
590756d1e8 Update submodules on '6.5 in qt/qt5'
Change-Id: I8db5176988e1a6cec75252218f66cd9c4bcaae20
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-03 00:42:00 +00:00
Simo Fält
3642a8371d Revert "COIN: Disable linux on arm config again"
This reverts commit a303445165.

Reason for revert: There are two hosts up and running

Change-Id: Iddb45bf8443940f4803bfb88f6d4c237946af626
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-08-02 13:21:13 +00:00
Alexandru Croitor
19f4fb85f0 CMake: Remove feature workarounds now that we ignore strawberry perl
Now that we ignore the libraries shipped within the strawberry perl
distribution, we can remove the explicit FEATURE_system_foo flags
because we'll default to using the qt provided libraries by default.

Task-number: QTBUG-113726
Change-Id: I0ef7ae2afd489107a4d5b2c4f859e1e3590ca5e9
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 3ed21fda1a)
2023-08-01 17:36:14 +02:00
Alexandru Croitor
cfa7028946 CMake: Ignore libraries provided by strawberry perl
Because we have strawberry perl's bin dir in the PATH, CMake considers
that a find_package prefix, and thus finds includes and libraries
that are shipped with strawberry perl.
That causes problems because the 3rd party runtime libraries are not
installed by the Qt installer, so any Qt modules / plugins that depend
on the 3rd party libraries will fail to load.

Use CMake 3.23's CMAKE_IGNORE_PREFIX_PATH option to tell it to ignore
strawberry headers and libraries.

We need to repeat it both for qtbase and non-qtbase args, to ensure
the libraries are not picked up for all of Qt.

This is a more general fix for problems like the one fixed by
a97bdde4d4

Task-number: QTBUG-113726
Change-Id: I706bf9ac945a47dc809bbb6eb9eda4ca93f84695
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 9b7dcd94df)
2023-08-01 17:36:12 +02:00
Alexey Edelev
593bbf54db Disable native_grpc feature for "Packaging" platforms
Native gRPC channels rely on the reference gRPC implementation that
doesn't guarantee the ABI compatibility between different versions. We
shouldn't link libQt6GRPC to any 3rdparty libraries that are not
delivered as part of Qt when make packaging builds in CI.

Task-number: QTBUG-115055
Task-number: QTBUG-110107
Change-Id: Ie099b0af833d87308179d3b4eecc47738078010c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b028d7499f)
2023-07-27 09:46:06 +02:00
Assam Boudjelthia
784bd91970 Add file names to .gitignore
* CMake's .user files created by Qt Creator.
* .vscode Visual Studio Code config folder.
* .DS_Store macOS files.
* In tree build folders.

Change-Id: Id23358759c1e18d72fd88c399732ea58693af09d
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit f6d8a7ddb9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-07-20 18:12:08 +00:00
Simo Fält
78b270c60a COIN: Remove remaining Conan profiles from Android-automotive configs
Amends 55edbbaea0. These configs are
6.5 specific.

Change-Id: I3d94adeeeb5c3ba87d548f0c1203a29641290b17
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-07-14 11:26:22 +03:00
Simo Fält
15d86bfc47 Upgrade MSVC 2022 and 2019 for Windows 11 22H2
Change upgrades also build tools for both visual studios

MSVC 2022: 17.6.4
MSVC 2019: 16.11.27

Change-Id: Icb847704636467d133fa578e46e93b6973aeb0a9
Task-number: COIN-1059
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 497bd051e4)
2023-07-12 07:05:11 +00:00
Heikki Halmet
81f3ea0f5f Upgrade MSVC 2022 and 2019 for Windows 10 22H2
Change upgrades also build tools for both visual studios

MSVC 2022: 17.6.4
MSVC 2019: 16.11.27

Task-number: COIN-1059
Change-Id: Id212d396a58827d5794158a4b314ec65ad5a3f47
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 6341108c6f)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2023-07-12 09:05:10 +02:00