mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
18a08f7eb6
This patch amends 133de012af95507ac485845d8de8f58da005df64.
The previous patch introduced a regression where the newer build paths
were not being passed correctly into 'fix_ffmpeg_dependencies.sh'
during FFmpeg Android builds.
This patch introduces a common function to resolve the installation
directory, which is then used both during compilation and during
FFmpeg patching.
Additionally, it introduces some basic error-handling when running
'fix_ffmpeg_dependencies.sh' so that we can catch this issue in
integration, in the future.
Fixes: QTBUG-138615
Change-Id: I195ebd3034a3184bad32e75916a41a20838b2db1
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 7f416abf32)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Continuous Integration ====================== This directory contains files used by Qt's Continuous Integration system (Coin). pre-provisioning ---------------- Contains scripts which are used to install software to tier1 machines manually. E.g. Visual studio installation takes too long to be included to automatic provisioning of tier2 templates. provisioning ------------ Contains scripts that apply to different test machines in order to run automatic tests on them. For Windows scripts, make sure that the machine has "Set-ExecutionPolicy RemoteSigned -Force" set. (Run as admin in PowerShell)