Commit Graph

5377 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
540e83e83c Update submodules on '6.6 in qt/qt5'
Change-Id: I811c8e26517d62da79bed01edb7bb8f79e7a54eb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-09-01 18:55:48 +00:00
Qt Submodule Update Bot
d816d5198b Update submodules on '6.6 in qt/qt5'
Change-Id: Ibc5126df76dca3cae865dcb553c1c41c4b0cd458
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-31 01:35:27 +00:00
Simo Fält
932419ebb9 CI: Enable debian amd64 debian packaging config
Pick-to: dev
Change-Id: I4efcdb930edb6b42e1042316986e5fb11ca337f6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-08-30 12:00:58 +00:00
Simo Fält
442f28b534 Provisioning: Install debian packaging dependencies to Ubuntu
Pick-to: dev
Change-Id: I320adf737c7ac9da45e27b30b385318f1d925905
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-08-30 12:00:56 +00:00
Qt Submodule Update Bot
ee432cd0e3 Update submodules on '6.6 in qt/qt5'
Change-Id: I94567bc38d707b6eec6e7dc40c04a80be99530ba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-29 19:40:26 +00:00
Qt Submodule Update Bot
669e16bb14 Update submodules on '6.6 in qt/qt5'
Change-Id: Ic0670a26b663728f26b810806f7f288dcc83daad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-29 00:58:01 +00:00
Simo Fält
5b30b2f432 Provisioning: Copy backported .deb files for sbuild
These are required to successfully build debian packages for
Ubuntu Focal.

Pick-to: dev
Change-Id: I708f3716ba8d1251bfae22da325e8e27f0fb80fe
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-08-28 10:24:58 +03:00
Simo Fält
00af6b857a CI: Enable debian arm64 debian packaging config
Pick-to: dev
Change-Id: I15537eab53c6e879d22761a12b017f3aaab4f7ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-28 07:24:56 +00:00
Simo Fält
ef3fae89d3 Add qtdeclarative as recommended dependency for qtgrpc
Pick-to: dev
Change-Id: I311095a1da4f181662d2552692de02e1573e8d53
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-08-28 07:24:54 +00:00
Artem Dyomin
2fd6dfcf6a 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:10 +00:00
Qt Submodule Update Bot
753cbb9d04 Update submodules on '6.6 in qt/qt5'
Change-Id: I9d38711b230c44e7f488a69fa21915b25ce2e8bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-24 14:32:01 +00:00
Matti Paaso
65dac8226a 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)
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-08-23 05:39:29 +00:00
Qt Submodule Update Bot
2d54b11406 Update submodules on '6.6 in qt/qt5'
Change-Id: I6ae5f43fdd26ef5114a5cfc3618c5f3690f2eac4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-23 05:39:28 +00:00
Artem Dyomin
14ed5a5ad8 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:54:56 +00:00
Qt Submodule Update Bot
af6613c95d Update submodules on '6.6 in qt/qt5'
Change-Id: I3da90ad6fc05fca2be91b87c928fe1b34693ed61
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.6.0-beta3
2023-08-17 04:13:50 +00:00
Qt Submodule Update Bot
0c97645592 Update submodules on '6.6 in qt/qt5'
Change-Id: I8cf5cd417b91e3287fd266054409afbcb77a1508
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-16 05:48:02 +00:00
Fredrik Ålund
51e36a6c80 Fix provisioning script for Mimer SQL on Windows
When building on Windows in the CI environment the Mimer SQL libraries
where not found. The updated script set an environment variable that is
is when building the QtSql Mimer SQL plugin

Fixes: QTBUG-111219
Change-Id: Id486a5a3b37d90cd19180f7900456eeae910d1de
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 7200dcc016)
2023-08-15 20:20:37 +00:00
Artem Dyomin
c0bd7126b3 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)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-14 08:47:02 +00:00
Amir Masoud Abdol
46a8c416f9 Update emsdk_windows_3_1_37.zip SHA1
Amends 13c53ef79f

Change-Id: I941301daf06f92284d05a84f01b8e97f33c63891
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
(cherry picked from commit 12a3ab0059)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-13 05:39:03 +00:00
Qt Submodule Update Bot
19eb92a537 Update submodules on '6.6 in qt/qt5'
Change-Id: If38082f584156b1746664890f7401919420a51e2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-09 05:33:38 +00:00
Ivan Solovev
e73d001815 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-08 07:19:50 +00:00
Matti Paaso
87dc95637f 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
Alexey Edelev
e0ab4a476d Enable ProtobufWellKnownTypes build for iOS
Specify QT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR that points to the
host protobuf include directory, to grab the required .proto files.

Task-number: QTBUG-115582
Change-Id: I4e8b3043b105b05799921ac9a943f414718c1d09
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit fc257d16aa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-04 05:20:52 +00:00
Qt Submodule Update Bot
714cff7dfb Update submodules on '6.6 in qt/qt5'
Change-Id: Ia5c49df288f6107063d354b5be41e0a03444aae4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-03 19:33:46 +00:00
Allan Sandfeld Jensen
7c136e1801 Update requires packages for SLES for WebEngine
Fixes: QTBUG-115722
Change-Id: I563879a4fd73f99b5d0c275e0c66fc05c7d833a3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 77e5ed942b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-03 09:51:22 +00:00
Alexey Edelev
06dd9145b5 Allow building ProtobufWellKnownTypes on WASM packaging platform
Specify QT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR that points to the
host protobuf include directory, to grab the required .proto files.

Task-number: QTBUG-115582
Change-Id: I3184439d92c8b79c9dc78a117584f7cf56b9eb97
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>
(cherry picked from commit bde2b6e0eb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-08-02 14:49:33 +00:00
Simo Fält
7ec82bd78e Revert "COIN: Disable linux on arm config again"
This reverts commit 3e7b47c402.

Reason for revert: There are two hosts up and running

Change-Id: I89b2286110f8dab5efe6f5491460862b46d7f5c5
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-08-02 13:21:19 +00:00
Alexandru Croitor
f8eb9916f1 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:09 +02:00
Alexandru Croitor
6529d1bb4e 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:08 +02:00
Qt Submodule Update Bot
59da1f0dfe Update submodules on '6.6 in qt/qt5'
Change-Id: I701a58a01612e2aaf4503c3eaac802f9d20fdb3d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-08-01 01:10:15 +00:00
Assam Boudjelthia
dc3866067a Coin: temporarily set ubuntu-22.04-documentation targets insignificant
... and the targets that depend on it, to deal with a cyclic dependency
in qtwebengine chromium update.

Change-Id: If5f64aed4d5e6ce34b8c6e58b3657fc3a438cb8c
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit c0cf9e7b28)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-07-30 17:13:31 +00:00
Assam Boudjelthia
caf1273921 Coin: install specific version of openjdk 11
Android's sdkmanager seems to fail with openjdk 11 version 11.0.20.0.8.
The previous version 11.0.19.0.7 seems to work. the error is failure to
find /usr/lib/jvm/java-11-openjdk-11.0.20.0.8-2.el8.x86_64/lib/tzdb.dat.

This is more of a workaround for now to unblock provisioning.

Change-Id: Ib50b497c6e8b6bffd0739bf665ab1deb5bd51666
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 8b6151e23d)
2023-07-30 17:13:28 +00:00
Qt Submodule Update Bot
284d879f7c Update submodules on '6.6 in qt/qt5'
Change-Id: I905455264c25bdb7ea621ea7e8deced949491604
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-30 17:13:25 +00:00
Dominik Holland
48b2b39a11 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)
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2023-07-30 17:13:22 +00:00
Allan Sandfeld Jensen
3a69f0d31b Add libva-devel and gbm-devel packages for qtwebengine
Will be needed in Qt 6.6 for VA-API

Change-Id: I4389ee03eb85a05f9bce37a0eb4629d30e1aefd1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit d1552c26a8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-07-30 17:13:19 +00:00
Simo Fält
4bbc98ff43 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-30 17:13:17 +00:00
Alexey Edelev
bc90fcb4a4 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-28 15:30:50 +02:00
Assam Boudjelthia
72a2c43bb5 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
Qt Submodule Update Bot
7a1acaea39 Update submodules on '6.6 in qt/qt5'
Change-Id: I185e06796d445876c9e3128781b9cfdc0215c488
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-12 22:38:00 +00:00
Joerg Bornemann
f03e39cb56 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-07-12 08:48:27 +00:00
Alexandru Croitor
152b5beb8c 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-10 08:07:15 +00:00
Allan Sandfeld Jensen
839385fc1e Update node.js on Linux/macOS
Qt WebEngine 6.6 need 14.19+

Change-Id: Idf2d54fcdc55762cd9d8cfe5248858bd00afe89c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d764e8fe39)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-07-10 08:50:34 +02:00
Qt Submodule Update Bot
2da4760c21 Update submodules on '6.6 in qt/qt5'
Change-Id: Id0c16cbb8ede64dd9053e91eb946768699ad14a5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.6.0-beta2
2023-07-09 00:03:23 +00:00
Heikki Halmet
a4c0d0104b 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-09 02:03:22 +02:00
Allan Sandfeld Jensen
349d3e1a2f 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-06 06:41:47 +00:00
Amir Masoud Abdol
235cb3b7b0 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-07-06 05:17:38 +00:00
Fredrik Ålund
33a76dfc57 Add missing provisioning scripts for Mimer SQL for RHEL 8.6 and RHEL 8.8
The provisioning scripts for Mimer SQL is missing in RHEL 8.6 and
RHEL 8.8 and therefore the Mimer SQL QtSql plugin is not built

Fixes: QTBUG-111219
Change-Id: I9c12b7d94ab7b047ed08b46043ad16586968ecfd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit af7c74313d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-07-05 14:47:48 +00:00
Qt Submodule Update Bot
4986b4d90f Update submodules on '6.6 in qt/qt5'
Change-Id: I05f3cc9ba1f3a4d488c14d27b22c81944afe4bc5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-03 19:56:53 +00:00
Allan Sandfeld Jensen
52394ad84a Update node.js on Windows to 18.16.0
Needs to be at least 14.19 for Qt WebEngine 6.6

Change-Id: I1d4b8b241d18eeeffa1b2a9eed0e85cbf54e49ba
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit de0104b3ed)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-07-03 14:25:14 +02:00
Simo Fält
6bedd9ec81 Add qtmultimedia as a recommended dependency for qt3d
Qt CI requires qtmultimedia binaries to create debian packages.

Pick-to: dev
Change-Id: Ib29cefe15db7f32fb9457320d899a4996bda6cba
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-06-30 04:03:05 +00:00