On RHEL8, openssl1.x.x is default, and openssl3 pc files
are with the suffix "3", so FFmpeg cannot find them.
The patch fixes pc files so that ffmpeg can find them.
Task-number: QTBUG-130257
Change-Id: I5a95daae0a78aadede109535b2823483bfcbc09d
Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
Reviewed-by: Pavel Dubsky <pavel.dubsky@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 6cd74e132a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Task-number: QTQAINFRA-6378
Change-Id: I7f8147f4c2c8c138d55558cd5a7d8d976d2e2b82
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit ec0228377d)
This file is used by the script common/unix/install-ffmpeg-android.sh.
This script is useful for compiling FFmpeg for Android locally
on macOS. Currently the script assumes the Homebrew installation
of readelf is that of x86. The Homebrews path for readelf is different
under arm64 and this change accounts for this.
Pick-to: 6.5
Change-Id: I7ec1d4173e35fe91bc988492e56dd9a5fcbad072
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 03ffb92263)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The QtSynchronizeRepo.cmake script, which is meant to be driven by a
git-sync-to script, has been rewritten to support more use cases, as
well as improve the code readability and error reporting.
The script now supports the following additional use cases:
- Clone a specified qt/{repo} submodule from code.qt.io into the
current directory, and initialize (clone) its dependencies
- Initialize a submodule and its dependencies in an existing qt5.git
super repo. This is similar to what init-repository does, except
instead of using the qt5.git sha1s, it uses the dependencies.yaml
of the specified submodule
- Support for git fetch --depth, to allow shallow cloning of the
specified submodule and its dependencies. This is useful for CI
where only a specific revision needs to be checked out.
The main incentive for this change is allow cloning qttools/dev/HEAD
and its dependencies in a CI run, but it's useful for daily work as
well. At some point we should check what can be merged together with
the existing init-repository script.
Task-number: QTBUG-128730
Change-Id: Ie6d49d253223cc93b8831ef41d25e0adeac39b8b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 710bc2d90e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The GStreamer backend of Qt Multimedia has known issues with pulseaudio,
caused by bugs in the time smoother. We therefore install pulseaudio 16
from a PPA on our ubuntu testers.
Task-number: QTBUG-112014
Task-number: QTBUG-124372
Task-number: QTBUG-126799
Pick-to: 6.5
Change-Id: Ifd18ff4b9904ac0ee022c9158e96ebca8768599f
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit cc17f25cd1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This patch adds FFmpeg provisioning for Android and iOS for
qtci-macos-12..15-arm..x86-64 by syncing with qtci-macos-13-x86_64
where this was already done.
Change-Id: I070514cbff12504db7c6fa77111e12d7e500ce30
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 2728b7ac6f)
Reviewed-by: Nils Petter Skålerud <nils.petter.skalerud@qt.io>
Instead of relying on the qtbase coin instructions to compute the
SBOM_PYTHON_APPS_PATH path based on the platform, which does not work
reliably, especially when multiple python installations are present,
explicitly specify the path in the provisioning scripts.
Amends 1f2fb6312c
Task-number: QTBUG-122899
Task-number: QTBUG-124453
Task-number: QTBUG-125211
Change-Id: I097fd1c4119a203d82f88c477dbf0fc0f67f19f2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 6f991b55a3)
The 'reuse' tool installed into the Python 3.8 environment on Windows
has a broken 'jinja2' package, due to conan being installed
after the sbom tool, which replaces the jinja package. pip reports the
issue but does not actually exit with a non-zero status for some
reason, thus not blocking the initial provisioning.
The jinja2 version installed in the Python 3.10 environment on Windows
is compatible with both conan and reuse.
To work around the issue, explicitly install the sbom tools only for
Python 3.10 on Windows platforms, and specify the path to the Python
interpreter in an environment variable for the build system to use.
Amends 1f2fb6312c
Task-number: QTBUG-122899
Task-number: QTBUG-124453
Task-number: QTBUG-125211
Change-Id: I386da17a1902dd26af332cef3482dbcb2221a1b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit e874a76a48)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Script would previously unconditionally run ln even if target file
sometimes exists in precompiled OpenSSL library.
Change-Id: I90c4ad7c6cbf9207c2c82114936b478a9ba4ae54
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 758ac7896f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
popd was placed incorrectly and caused the script to be unable to find
the fix_ffmpeg_dependencies.sh file.
Change-Id: I7922a698e90d1b3899ecc7b2240a260ea706707f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 8f47837a59)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The vivid kernel module emulates a v4l2 video devices like webcams. We
instantiate two devices via vivid to allow qt multimedia unit tests
requiring multiple cameras to run correctly.
Pick-to: 6.7 6.5
Change-Id: I1b87954e3c8af797f5b09dabf2d4939d8320db06
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 8ba7d0c382)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The MSVC platform was not there when the rest of the platforms where
adjusted to build examples as standalone. Now that it's here, add it.
This is a pre-requisite for building examples as external projects
with MSVC.
Augments d278e682c6
Task-number: QTBUG-90820
Task-number: QTBUG-96232
Change-Id: I4a77d16e0f683f5984beeedb6e6d32707847383b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 2dce30db01)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Red Hat 8.10 VM template -50 does not have a user set for SSH. This is
fixed in template -51.
Change-Id: I602976a0214f6e0f4661e6b876c0710bc3ea9df9
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 293aeab453)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Currently any configuration tagged with the 'LicenseCheck' feature
uses the qtqa/master tst_licenses.pl script for license checking. The
exact instructions that are run are hard-coded in the Coin repository.
This is inflexible, and also confusing because qtqa has a dev and a
master branch, and people forget to cherry-pick changes to the master
branch.
Furthermore always using the qtqa/master branch for all qt5.git
branches is limiting, because no instruction changes can be made to
a specific qt5.git branch.
Using the new instructions added in qtbase commit
2a0e89981a52633c497f62bad0c7d26c466493cb
we can now tag configurations with the 'LicenseCheckV2' feature.
Integrations will then use the instructions from the active qtbase
SHA1 to run the license check.
Currently the qtbase instructions will always use the qtqa/dev branch
for the license check, for both the dev and 6.8 branches, but in the
near future we will likely want to create versioned branches for
the qtqa repo, just like the rest of our repositories, so that we
can have specific license check instructions for specific branches.
Task-number: QTBUG-124453
Task-number: QTBUG-125211
Task-number: QTBUG-125569
Task-number: QTQAINFRA-3935
Change-Id: Ica024dec44a9581c49cdfb555ba93667f7b34780
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
(cherry picked from commit 0055441fc7)
Qt Creator uses libsecret for saving passwords.
It is dynamically resolved during runtime, but we need the
development package at build time to enable the feature.
Fixes: QTCREATORBUG-31381
Change-Id: I71077694ff0f4d04b1d85215791dc7f6f6663f64
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
(cherry picked from commit 3369aab7fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
qtci-macos-11-x86_64-107 and qtci-macos-12-x86_64-107 have been created
to add VNC accessibility.
Bump the image version used in CI, in order access debug VMs.
Task-number: QTQAINFRA-5815
Task-number: QTQAINFRA-6626
Pick-to: 6.5
Change-Id: I42c6602f9524b1fbfe47da081a7a15deff001f68
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 03f00931ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This patch includes the followup fix that also adds the "non tests"
developer build configuration for macos.
Task-number: COIN-1181
Change-Id: I91b156bf4217aba517d02d9003605b09edb08ec6
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 49b80c57c6)
Libclang is needed for QDoc.
Adding support for WoA (arch=arm64) also introduced a need
to change archVer parameter from Integer to a string.
Task-number: QTBUG-129256
Change-Id: I13f15925a7639c6f926c564146fbbc88f73fff8f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 1fe16f55f0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Don't try to re-install, but install and let apt do its magic.
Fixes: QTQAINFRA-6638
Change-Id: I60ccd2717854c6644d1b956362ee3fd535e2d87c
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit f24dacca36)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The current revision 9 seems to have issues that are not reproducible
on other environments and even not with other ABIs like x64 or arm64.
Task-number: QTBUG-97650
Change-Id: I6f4827f170ea11b8aae9cc774c075fa043e4df5a
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit e1015f2718)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Use the sha from last update of Gradle and update AGP version
to match qtbase.
Change-Id: Ia235dacfc3206246c4c4330fb185ce1319d45909
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 536555cde6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Different compiler than on RHEL (10.2 vs 10.3)
Change-Id: I3d115dfcc085c0d561a42022e61225f1f280493f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit 725cd2faaa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Create common yaml for building static release packages
for all host platforms, including arm linux and windows.
Task-number: QTBUG-117504
Task-number: QTBUG-117819
Change-Id: I8ee78eb9aa4fa5150141227e3367dee1be10f907
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 21e8dd696b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Changed device's start timeout to 3 minutes,
and restarting retries to 3.
Changed emulator boot check loop to check against
real time value instead int value.
Some of the tests caused previous
for-loop to take more than 1 second.
Task-number: COIN-1154
Pick-to: 6.5 5.15
Change-Id: I58066ad8f440b2fdee3c5b64d094b2713007bf19
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 14c7c3061b)
Reviewed-by: Jani Korteniemi <jani.korteniemi@qt.io>
