mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 11:26:04 +08:00
de1524f320
The installer from Microsoft which is used for ARM machines has a different default installation path compared to the installer from Oracle that is used for x64 machines, but the provisioning script did not take it into consideration. As a result, the JAVA_HOME variable was pointing to a non-existing dir on Windows ARM machines. An attempt to adjust the installation path using TARGETDIR or INSTALLDIR properties did not work, so this patch simply hardcodes the path that is used by the current ARM installer. Amendsb3f5b4fd64that added Java provisioning to Windows ARM. Task-number: QTBUG-138968 Pick-to: 6.8 Change-Id: I2abdc07195a9c633340c2d7b21deaa80762aee67 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit6044f4fd12) 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)