Commit Graph

339 Commits

Author SHA1 Message Date
Lucie Gérard
f477802046 Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Task-number: QTBUG-67283
Task-number: QTBUG-108364
Change-Id: If26e4d35c780db4a7982bb84872b251dad24716e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit eecfb19548)
2023-09-11 12:18:35 +02: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
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
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
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
Alexey Edelev
9b481175c4 Uninify MSVC version that is used in provisioning
We pick the oldest build tools we can find because there is lower
chance that the produced binaries will be incomaptible with the newer
version of MSVC.

With the current provisioning design we also cannot change the MSVC
version for the each package on demand. Once Enter-VsDevShell is called
it litters the powershell environment and blocks the use of
Enter-VsDevShell second time. It could be better to run each .ps1 file
in own instance of powershell to avoid mixing build environment.

Amends f58afd5476

Change-Id: Ie752cfc8b69ed985e61ec16209007dd586611866
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 84df93d37e)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-05-17 22:55:28 +00:00
Samuel Mira
e4447d0b55 Fix FFmpeg provisioning for Android armv7a
Altered install-ffmpeg.ps1 script to build android armv7a archicture

Task-number: QTQAINFRA-5476
Change-Id: I5179174c8676a3016df2922c00030e9d45a9009c
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 2751db4d29)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-17 22:55:21 +00:00
Artem Dyomin
f65288d120 Update ffmpeg version to n6.0
Checked the basic functionality on macOS, linux, and windows.
To be tested in detail.

Change-Id: I109f52ab33d58088332a3885c83d622815edd22e
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit aed030bb90)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-04-16 22:43:57 +00:00
Heikki Halmet
7a3e084a4a Enable MySQL for Windows
Task-number: QTQAINFRA-4999
Change-Id: Id967473858673253f536cb91f9a95d9d6a3d7f27
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ec2dd3438c)
2023-03-21 05:52:46 +00:00
Assam Boudjelthia
c46c54fe7d Coin: bump Android platform sdk and build tools version to 33
Use latest platform and build tools to be able to build for Android 13.

Change-Id: I00bd9948f528d398d471e91de1d22954d786be29
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 8abebe23ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-03 21:30:44 +00:00
Artem Dyomin
3624ce9c5e Update ffmpeg version to 5.1 for desktop platforms
Some issues have been fixed in ffmpeg 5.1, e.g, with videotoolbox.
So the update at least fixes our playback
of some video formats on macos, e.g. provided in the related bug.

After the update I tested the basic functionality on windows,
linux, macOS, and run CI tests, which are OK.

Task-number: QTBUG-98102
Change-Id: I72f45780e1c3983d6a1941db2b833b78784b90de
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 0f8eccdfc5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-17 17:56:29 +00:00
Heikki Halmet
252c7ae303 Start using OpenSSL 3.0.7 in CI
Task-number: QTQAINFRA-4889
Change-Id: I3e335395762710d520ca93a5996d1b21d202ed4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vladimir Minenko <vladimir.minenko@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 68a7947e42)
2023-01-16 18:57:36 +00:00
Heikki Halmet
430ad49cc6 Change to use sha256 signed opengl32 mesa dll files
Task-number: QTBUG-108774
Change-Id: I7d2716aa23215b783365c293c968aeeef6626126
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 1fd2a26492)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-03 01:38:06 +00:00
Simo Fält
af2cb2edc4 Provisioning: Update default python3 version
Removing python3.6 and replacing it with more recent versions.

Change-Id: If8cd4c369e4fc9ff8dc7d53865b80b588f278091
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 95e9f8da9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-12-29 15:46:03 +00:00
Morten Sørvig
4ee1668f46 wasm: update emscripten to 3.1.25
Qt 6.5 will require emscripten 3.1.25

Change-Id: I23e0d0b6951a4d69aa431710114ec2c06f7afcc3
Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-12-28 11:22:31 +01:00
Konrad Kujawa
63d72293b7 Add provisioning for gRPC
Add provisioning scripts to install gRPC.
gRPC is requirement to build QtGrpc

Task-number: QTBUG-105492
Change-Id: I1a6d008a1d2c1616000909aacdb721401f706168
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-12-07 07:57:21 +01:00
Oliver Wolff
37c0cf82ae Provisioning: MSVC 2019 update: Add Vswhere helper function
Pick-to: 6.4 6.2
Change-Id: Idd6bf24450d9447c38c39c64abff5b55d71c12b9
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
2022-11-28 09:00:42 +01:00
Alexandru Croitor
6943f28b17 CMake: Update provisioned CMake to version 3.24.2
Needed to fix iOS Xcode generator builds when using Xcode 14.
Otherwise compiler identification fails due to a code-signing error.
We hit it in our iOS MinimalStaticTests configuration.

 error: Cannot code sign because the target does not have an
        Info.plist file and one is not being generated
        automatically.
         (in target 'CompilerIdCXX' from project
         'CompilerIdCXX')

See https://gitlab.kitware.com/cmake/cmake/-/issues/23719

Amends eee152ca70

Fixes: QTQAINFRA-5044
Change-Id: Idabd78e6e28816a8fc4dd7e627de82f2c622c54e
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-11-26 18:19:17 +01:00
Artem Dyomin
817a6d07f8 Add diffutils to msys2
cmp command is used by ffmpeg ./configure

Pick-to: 6.4
Change-Id: If80664d6c3318b7605c69d50e7606a1ec10840ea
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-11-24 09:54:11 +01:00
Artem Dyomin
5ef8294f3f Enable llvm-mingw ffmpeg windows build
- Added build of ffmpeg for llvm-mingw
- Improved build errors handling
- Refactoring: decompose script into a few functions

Build example:
https://testresults.qt.io/coin/integration/qt/qt5/tasks/web_qt_qt5_1668780311363
See tests for LLVM-x64, they passed

Pick-to: 6.4
Change-Id: I59fe28ba6eb8e65ef5c4c3d08343ff72f349bd21
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-11-24 09:53:57 +01:00
Konrad Kujawa
2034c71953 Update Protobuf to 21.9 version
Change-Id: Ia25251b87ea993f47046b9cfff3d0b024b57277f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-23 09:14:04 +01:00
Luca Di Sera
487c92a3d0 Update QDoc libclang to 15.0.0
The `libclang_version` variable is now updated to the current version, 15.0.0,
in both "coin/provisioning/common/unix/libclang.sh" and
"coin/provisioning/common/windows/libclang.ps1".

The naming of the artifacts for the provided library was slightly
changed from previous versions.

Before, the version number would contain two integers separated by a
dot.
The generated artifact would be named after this version number, with
the dot removed.

That is, for example, for version 12.0, a release artifact would be
called "libclang-release_120.*".

The updated two version uses a three segments version number and,
furthermore, the artifacts name do not collapse the separating dots such
that a release artifact would be called "libclang-release_15.0.0.*".

To support the new naming scheme, some processing was removed from both
provisioning scripts.

For Windows, the line removing all dots from the `libclang_version`
variable was removed.

For Unix, the removal of the dots in the `libclang_version`
variable when expanding the variable to generate the target urls to
retrieve the artifact was removed, using the bare value of the variable
itself.

For Unix provisioning, the artifacts for some of the platform, namely
"CentOS" and "Ubuntu 22.04", are not provided anymore.

"CentOS" was replaced by "Rhel8.4" on "gcc10.0", hence the target url
for the redhat platform was modified based on the new name.

The "Ubuntu 22.04" artifacts were not provided, such that the platform
was removed.

The sha1 of the target artifacts on both provisioning script was updated
for all platforms.

Task-number: QTBUG-107199
Pick-to: 6.4
Change-Id: I873680825b0953e897c610fb0b47f3cd90625646
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2022-11-17 20:20:33 +01:00
Heikki Halmet
2a7c08f591 Provisioning: Remove MSVC 2019 build tools update
Running vsinstaller twice seems to cause problems. Second installation
get stuck and it can't be used again. Seems like somethin get corrupted.

Pick-to: 6.4 6.2 5.15
Task-number: QTQAINFRA-5090
Change-Id: Ic638879ea2f70bc74c028bff24daceb50e98480d
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2022-11-15 09:48:23 +00:00
Oliver Wolff
bc4797a7e8 provisioning: Check successful installation of MSVC 2019 update
Using vswhere we can make sure if the MSVC 2019 update finished with the
right version. For further safety we check, if the installation is
complete and launchable.

Pick-to: 6.4 6.3 6.2 5.15
Change-Id: I90e84bf4922647b4ff30ba93a207b9d5e1a96120
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-11-10 06:49:32 +00:00
Oliver Wolff
37f4d821b8 provisioning: Make sure that MSVC 2019 version is added to versions.txt
If MSVC 2022 is installed in CI machines, vswhere -latest without any
additional version information will return the latest version of 2022.
By limiting the version range (>=16, <17) we make sure that only the
latest version of MSVC 2019 is returned.

Pick-to: 6.4 6.3 6.2 5.15
Change-Id: I8f92099f030660c1914ffb728efc9a55eadf4808
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-10 06:49:29 +00:00
Artem Dyomin
bc5662c050 Fix ffmpeg build on windows CI
Ffmpeg was not compiled because of failed yasm installation
on msys2. The installation failed due to checking pgp signatures.
Current fix adds keys refreshing that fixes the problem (checked
on CI and on local machine)

Note, currently the ffmpeg build works with msvc and mingw,
additional settings for llvm should be added in next commits.

Build example:
https://testresults.qt.io/coin/integration/qt/qtmultimedia/tasks/web_qt_qtmultimedia_1667916985085

Pick-to: 6.4
Change-Id: Iff305e896bfb382c0c4030235cc2ad942cbbc002
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-11-10 05:36:11 +01:00
Matti Paaso
936ede45de Update Android NDK to version r25b
Update NDK to version r25b and prebuilt openssl 1.1.1m built with
it. Change log: https://github.com/android/ndk/wiki/Changelog-r25

Task-number: QTBUG-105397
Change-Id: I501f43066e7ba8af8a57efdbee6c4a625bb80852
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-10-17 19:47:10 +03:00
Heikki Halmet
825736dd7a Update Git version
We need newer ssh for RTA use. Current version has problem with
ConnectTimeout:
https://github.com/PowerShell/Win32-OpenSSH/issues/1352
Latest git version comes with OpenSSH version 9.0p1 from which this
should be fixed.

Pick-to: 6.4 6.3 6.2 5.15
Task-number: QTQAINFRA-5038
Change-Id: I5aac1db22b1145163ee947537b363a94b86d094d
Reviewed-by: Timo Lahti <timo.lahti@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-09-24 11:10:27 +03:00
Heikki Halmet
8a72b1de99 Support multiple Android NDK versions
We need to verify latest Android NDK version in all
Qt6 branches and we need to retain the NDK version we
had when the specific branch was released at the first time.

Verification of the latest NDK will be done during integrations
in 'dev' branch and with older brances it will be done using
nightly build targets

Task-number: QTQAINFRA-4990
Change-Id: I2a96e419d403820f55f4244230c28ad09dc9095b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-09-20 10:30:05 +03:00
Mårten Nordheim
b09cac4448 Build & install protobuf on windows
Change-Id: Ic66bf6afba3ca53e13bfcd079471658eacfb528e
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2022-09-07 14:22:17 +02:00
Johanna Äijälä
6754cb362a Provisioning: update Squish 7.0.1
Update Squish to 7.0.1, include versions with Qt6.3 and 6.2 support.

Pick-to: 6.4
Pick-to: 6.3
Change-Id: I2bd7cd51a41befdbf2ef242eb72c2c2add84f733
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-04 07:04:51 +03:00
Volker Hilsheimer
aab85286b7 Fix calling of script creating shared folders
The calling script for each platform missed the leading ". " so
powershell never executed the script. Sadly, provisioning still
succeeded.

Add some log output to the script doing the work to verify that
the file system is what is expected to be at the end. If it's not,
then the cd'ing into the shares will fail and the script will
return with a non-zero exit.

Pick-to: 6.4
Change-Id: I8fe85c7e202132525876cdddf41750732f69aaf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-08-17 06:25:55 +02:00
Volker Hilsheimer
72ac097082 Add script to create shared folders for testing Qt I/O with UNC paths
Once these paths exist reliably on the Windows VM running the test, and
are shared, we can access them through UNC paths as

\\${COMPUTERNAME}\testshare

This allows us to remove dependencies to network infrastructure from
those QtCore tests.

The test needs to run last, as otherwise the Visual Studio installer
mysteriously fails to execute. So make some space at the end of the
script list.

Pick-to: 6.4
Change-Id: Ie11b894f000722a7d99b2c5e279c1b0b63021003
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-07-17 14:45:22 +02:00
Tommi Mänttäri
857ae6e1e1 CI Nightly: add Windows host support for QNX
Add required configurations to Nightly run for building
Qt SW in Windows host for QNX OS.

Task-number: QTBUG-101292
Pick-to: 6.4 6.3 6.2
Change-Id: I689abd6596bf1ab1f30ba07c198e12569dbf2164
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-06-14 08:03:59 +03:00
Piotr Srebrny
a273e9f11c Provision FFmpeg library for QtMultimedia plugin
One of the QtMultimedia backends is implemented using FFmpeg.
This provisioning enables building and testing of this backend.

Change-Id: Ia196c2ae4b457aa6b8e3ee8e0f367197aadfe0d9
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-06-13 09:56:56 +02:00
Lorn Potter
b6b127c2d9 wasm: update emscripten version to 3.1.10
Qt 6.4.0 will require emscripten 3.1.10

Change-Id: I9411902674104aae8f4ba3b6af11e9956932d6b9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-05-27 08:31:33 +10:00
Piotr Srebrny
9196022e01 Make Copy-Item to throw exception if source does not exist
Copy-Item command does not throw by default. Thus, copying error is
not caught and the Download function returns without downloading from
the official site. Adding "-errorAction stop" makes Copy-Item to throw
an exception as expected in the script.

Change-Id: I889cccac775705613e641453aca9e0197645f344
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-04-29 13:06:03 +00:00
Heikki Halmet
789c276431 Update NDK to r23b
This also fixes Android OpenSSL installation

NDK update will be added only to dev and 6.3 branches

Task-number: QTQAINFRA-4837
Change-Id: I1233217e71f345d30f3dec83d7477d3c6e3b6c2d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-04-12 11:45:04 +00:00
Simo Fält
bfc49c207d Provisioning: Update cmake to 3.21.3 to enable Android build
To avoid https://gitlab.kitware.com/cmake/cmake/-/issues/22634.

Pick-to: 6.2 6.3
Change-Id: I1227218514174843353b5bd5d831d89ed1ca89b4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-04-04 23:16:47 +03:00
Heikki Halmet
13a877d4d9 Add prebuilt Android OpenSSL package for OpenSSL 1.1.1m
Used OpenSSL source package 1.1.1m was changed little bit. All
ANDROID_NDK_HOME strings were replaced with ANDROID_NDK_ROOT in
Configurations/15-android.conf file

Task-number: QTQAINFRA-4864
Task-number: QTBUG-101863
Change-Id: Ia3d82005734ba69f1cc85708c867ae1955938739
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 686481f48c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-24 04:51:15 +00:00
Morten Johan Sørvig
53493a2351 wasm: upgrade emsdk version to 3.1.6
3.0.0 has a critical bug which can cause linking failures
(see QTBUG-101267). Update to the most recent version
where the bug has been fixed.

Task-number: QTBUG-101267
Pick-to: 6.3
Change-Id: Ib2e6abb72eb50b77db63175bbbf4a88b5e3c3920
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2022-03-12 16:10:12 +00:00
Heikki Halmet
96fe74b540 Fix Openssl android installation
Current provisioning installation is broken. Current package replaced
the old openssl-android-master-1.1.1m.zip and shasum changed.

Pick-to: 6.3 6.2 5.15
Task-number: QTQAINFRA-4848
Change-Id: Id5e3bc1a81f8b634668d189c7647eac7c612020a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-03-08 08:46:58 +02:00
Heikki Halmet
1cc99e61dd Remove protobuf scripts for Windows
Script is currently failing in windows and no one has noticed this.
So apparently script is not needed by any module. If this will be needed
in the future then script needs to be fixed and merged back to
provisioning.

Pick-to: 6.3 6.2 5.15
Change-Id: Ia3deb3011b0cb6a9e145d0f126d4ab6723ce79f3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-22 08:16:46 +02:00
Johanna Äijälä
b3cd29e56f Provisioning: Squish 6.7.2
Update Squish packages to 6.7.2.

Pick-to: 6.3
Pick-to: 6.2
Change-Id: Id16b6337ff779eb21e1bd421ac46c57ad183dde2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-19 09:03:44 +02:00
Oliver Wolff
a91868e2c1 Update MSVC installer bootstrapper before updating MSVC itself
If there is an outdated MSVC installer bootstrapper an update to MSVC
might silently fail. Make sure that we update the bootstrapper before
calling the actual update.

NOTE! This change also upgrades MSVC 2019 version to 16.11.10

See https://developercommunity.visualstudio.com/t/setup-does-not-wait-for-installation-to-complete-w/26668
for some more information.

Pick-to: 6.2 6.3 5.15
Fixes: QTQAINFRA-4813
Change-Id: Ia595ceb5b373d1210670d3f357fb501bca1c8272
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-02-19 09:03:42 +02:00
Heikki Halmet
8732165461 Provisioning: Update OpenSSL to version 1.1.1m
Pick-to: 6.3
Pick-to: 6.2
Pick-to: 5.15
Change-Id: I93702b9faac5abc9fc01a5725cf34a17a94f0bea
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-02-05 15:59:17 +02:00
Heikki Halmet
88cde9e500 Set correct Emscripten environment variables
Needed environment variables are set during emsdk installation when
installation is done using emsdk.git. But those are not set
as permanently. To have correct values we need to get them from
install environment and set them permanently for build environment.

Pick-to: 6.3
Pick-to: 6.2
Change-Id: Ifb80aa4a93608b79faffc8c59002c89804f60570
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-02-03 21:12:55 +02:00
Kai Köhne
becb423e80 Replace LGPL2.1 only header with LGPL3 one
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Pick-to: 6.3
Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-19 19:47:15 +00:00
Heikki Halmet
9d09f9cee9 Upgrade MSVC 2019 and build tools versions to 16.11.8
Task-number: QTQAINFRA-4704
Pick-to: 6.3
Pick-to: 6.2
Pick-to: 5.15
Change-Id: I77e83f392869e81b20cdc11e970f24448bb66420
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2021-12-17 09:40:41 +02:00