Commit Graph

5345 Commits

Author SHA1 Message Date
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
Alexandru Croitor
1207e2ebcd CMake: Don't load QtAutoDetect for top-level standalone tests
We don't load it for qtbase standalone tests, we shouldn't for
top-level builds as well.

This brings us one step closer to fixing top-level standalone tests.

Change-Id: I7c2710e61951f6789fea63422bc575a1ac611cdc
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit c971db7e5b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-07-08 08:24:45 +00:00
Allan Sandfeld Jensen
d6fdf2d843 Fix SetEnvVar for Debian
Change-Id: I4152575cc071ea7f51e102a3807b05ed9f89d2fd
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 14f7603e91)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-07-03 06:58:29 +00:00
Teemu Holappa
075592750a Change macOS12 template from 106 to 105
Provisioning fails in 106 template.

Pick-to: 6.5.2
Change-Id: Ia0a39b9006cc63d0e587bd18fc189e2a47408635
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2023-06-29 16:05:28 +03:00
Assam Boudjelthia
df24eed9b4 Coin:Android: unify and update OpenSSL provisioning scripts
Use the same prebuilt pacakges for all platforms since the prebuilt libs
are going to be used for the target and they are not tied to the host.

Task-number: QTBUG-110025
Change-Id: I2c79722989902b16883b31cbc6e140855239fcc8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 4e59702b14)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-06-28 14:52:49 +00:00
Antti Kokko
7d3fec671f 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.

Pick-to: 6.5.1
Change-Id: I0c1b6602423b97f5be5dd7d146a37a3f41eced00
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2023-06-28 06:49:35 +00:00
Jøger Hansegård
d46ad89b2e Enable rebuilding FFMPEG for MSVC without deleting lib files first
To simplify testing modifications to the FFMPEG library, it is nice to
be able to rebuild FFMPEG without having to manually delete lib files
first. This change makes this possible because it uses powershell
Move-Item instead of Rename-Item to rename .o files to .lib files.
Move-Item's -Force argument allows renaming files to destination that
already exists.

Change-Id: I0a56776d38c37d38d1cd74b5186881fc955d51f0
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit c4d26fe1d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-26 08:20:55 +00:00
Tor Arne Vestbø
55edbbaea0 Remove conan profiles
The conan experiment has ended, and the files are only bitrotting
nowadays.

Change-Id: Iefdc6fa1a48bb4062b15cf035f372a2d44bddda9
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8214de5e0e)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-06-24 12:09:21 +00:00
Simo Fält
a303445165 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)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-15 07:34:41 +00: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