Commit Graph

4961 Commits

Author SHA1 Message Date
Tarja Sundqvist
dccab84d90 Merge Qt 6.2.8 opensource release
Change-Id: I61132f961d0287f499c4528b20bbaf51d51902cc
v6.2.8-lts-lgpl
2024-04-15 11:40:59 +03:00
Tarja Sundqvist
48b9855b1a Merge Qt 6.2.7 opensource release
Change-Id: I6c90c68aad50fb5c7b60d9dd21837f33369515a1
v6.2.7-lts-lgpl
2023-12-20 09:16:18 +02:00
Tarja Sundqvist
7bba03e629 Merge Qt 6.2.6 opensource release
Change-Id: I7880027f964e94c3571f3beb5cb3a3fd5731448d
v6.2.6-lts-lgpl
2023-09-26 11:34:36 +03:00
Tarja Sundqvist
4575d6ac6c Merge Qt 6.2.5 opensource release
Change-Id: I1aefe27ca741fb891d88808a42426ac35d5537f1
v6.2.5-lts-lgpl
2023-07-14 19:18:53 +03:00
Mikko Gronoff
eacf5ace62 Remove duplicate MinGW environment variables
...amends commit fd7880c4f4

Change-Id: I670fe4aca3bcaf396822a322135655d4ed319c9b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-10-11 05:23:10 +00:00
Heikki Halmet
8744698c15 Fix rmt client setup to repo-clones
Change-Id: I36d8f24b19135345a2829e7521585c0cba9fc41f
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit f794796984)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-08-29 10:53:16 +00:00
Heikki Halmet
188bfa777e Provisioning: Update MSVC 2019 version to 16.11.18 in Tier 1
Older version seems to have issues with installer when updating
the visual studio and buildtools versions through installer via
command line.

Task-number: QTQAINFRA-5090
Change-Id: Iaec5391ed7bc9780374a7f971624522dae2feee6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 0507008ff6)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-08-29 10:53:09 +00:00
Alexandru Croitor
1704223e00 CMake: Switch an OpenSUSE config to build with CMake 3.16.8
To ensure we don't introduce regressions building Qt with the lowest
version of CMake that we support.

Task-number: QTQAINFRA-4844
Task-number: COIN-823
Change-Id: I59b6a0ed6851a5fbed701c4f6ea050062bddb773
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 0cfa1fa561)
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-04-12 18:34:14 +02:00
Alexandru Croitor
34a878536b CMake: Provision minimum supported CMake version 3.16 on OpenSUSE
This will allow us to switch one of the Linux OpenSUSE platform
configurations to build with an older version of CMake, to ensure
we don't introduce regressions.

Task-number: QTQAINFRA-4844
Change-Id: I2aa51175e3c393af079ab1d2b4648ced1fdf6a4a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 75bab52bb9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-12 16:34:12 +00:00
Qt Submodule Update Bot
5d542203f2 Update submodules on '6.2 in qt/qt5'
Change-Id: I5fd8db257637a7b8866f1bc223abc6dfd2746753
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-12 01:28:22 +00:00
Alexandru Croitor
641b56e52c coin: Allow using configure instead of cmake for top-level builds
This is the qt5 counterpart to the qtbase instructions to allow
using configure instead of cmake when configuring a top-level build.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: Ie5af31f9349a6dd88fa7699d40dad659180814e2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 2ee43055ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-11 19:44:00 +00:00
Heikki Halmet
dcf2680219 Provisioning: Install Android 11 automotive emulator
This is needed after moving from internal tqtc-qt5 branches to qt5.
Android 11 image was built internally.

Task-number: QTQAINFRA-4343
Change-Id: Ie0c4c5853079303ef9d4537f3b7b06ab62f14e3b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 12a87cba0a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-09 13:41:49 +00:00
Jani Heikkinen
a39240b38d Update LA 4.4.1
Task-number: QTBUG-101714
Change-Id: I4b9a88be5bfda3b542d9c10c51cc94f36dade932
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Santtu Ahonen <santtu.ahonen@qt.io>
(cherry picked from commit 1734139bf4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-06 16:49:53 +00:00
Eike Ziller
8e4c990b20 COIN/QtCreator: Remove old Windows 10 targets
We don't need two 64bit Windows targets.

Partial cherry-pick of ac2bdfb93a
which was applied to dev and 6.3, but not to 6.2

Change-Id: Ide3225a1a7a09bf97306ca8250e3d6f567d04111
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-04-06 17:10:19 +02:00
Heikki Halmet
26b43a7b28 Make Windows 11 21H2 significant
Task-number: QTQAINFRA-4673
Change-Id: I7eebc889dbc9ecc7c741147a2703575b5bfeb04d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit d6a7527384)
2022-04-05 08:17:35 +03:00
Pasi Petäjäjärvi
c74b05790c CI: Add env variable to indicate we are running tests in CI
Some tests change what they test depending if this env variable is set.
This was left out from 6.2 and 6.3 branches accidentally as it was added
only for dev branch at fba918784f as part
of bigger cleanup which introduced usage of qt-testrunner.py insted.

Change-Id: I0f55e42a6ae5b64132d13812ae0567975aedaa0e
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit fccc912655)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-01 20:11:13 +00:00
Eike Ziller
898ca8ab98 COIN/QtCreator: Add machine for Qt 5 based build
Since we still support Qt 5 based builds of Qt Creator, we'd like
to have that combination as part of the precheck.

Change-Id: I8f752f6e2aff4bebd644a87a1f51255ca482d337
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
(cherry picked from commit e2b2c06558)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-01 13:08:35 +00:00
Qt Submodule Update Bot
e22ba1c8f0 Update submodules on '6.2 in qt/qt5'
Change-Id: Icb10a8d455dc45330e55fa5695ddad5c26a1d186
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-01 02:39:04 +00:00
Pasi Petäjäjärvi
9afeb8539a CI: Add QtCoap network testservers for QNX QEMU
Change-Id: Ibc18edaf4a1d9dec309396eb80744b6a21738382
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 45a92d5f26)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-31 12:39:08 +00:00
Heikki Halmet
479360397e Provisioning: Install Chromedriver Chromium
This is needed by WebAssembly

Change-Id: I3e828d643d2780308514b2939db5a1b4032c66ac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: David Skoland <david.skoland@qt.io>
(cherry picked from commit f8311eaadf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-31 06:39:43 +00:00
Assam Boudjelthia
401aaa045b Add Android tests to Qt modules - part 2
The following modules are passing CI, so enabling them is possible
now; qt3d, qtconnectivity, qtmqtt, qtquicktimeline, qtsensors,
qtserialbus, qt5compat, qtpositioning, qtscxml, qttranslations.

Task-number: QTBUG-88846
Change-Id: Ic1048d0fadd551f42ef2d074b3b905cf3c8da339
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 807b259ea4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-30 05:48:24 +00:00
Pasi Petäjäjärvi
47e1dd34df CI: Add dns entry for network test server (not docker)
Servername qt-test-server is still used as local server name in tests
like networkselftest.

Change-Id: Iadda2254d4a45e95f90523cae90518fa74b24d6c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 6f5c0fbdf0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-27 00:42:26 +00:00
Pasi Petäjäjärvi
beb606c9cb CI: Add current directory to PATH because security update for QProcess
Because of 29fceed2ffb41954a63001414bd042611f2d4980 now all tests that
use binaries local to test folder will fail. Add current directory to
ssh connection PATH to fix this. On other platforms than QNX, this
happens to work as function qt_internal_collect_command_environment
sets the absolute directory path of external binary to PATH. Still tests
would fail when running directly tst_* binary instead via ctest.

Change-Id: I670d78a2a4362dc8d6faf271f2ad2a90ce2a8aa9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit c1e7cf5c25)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-26 14:56:27 +00:00
Qt Submodule Update Bot
db513056e3 Update submodules on '6.2 in qt/qt5'
Change-Id: I3f4104b11ebf5142ee35a7cb5ed63429b468d597
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-24 21:14:56 +00:00
Heikki Halmet
5f28d0680c 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:10 +00:00
Qt Submodule Update Bot
1415259122 Update submodules on '6.2 in qt/qt5'
Change-Id: I5010887347ef91189f2b7aafe70be1d82fb95809
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-23 05:06:29 +00:00
Heikki Halmet
ea4c99fee7 Add passing targets as significant
There is still autotests failures in one Windows 11 target

Task-number: QTQAINFRA-4673
Change-Id: I2f7958a6da358069799db18143789c99bb3f4dac
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 6cea45bfb8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-22 08:00:09 +00:00
Cristian Adam
65eac15d8b Update MinGW 11.2.0 to rev3
Revision 3 updates gdb to version 11.2.0.

This is not necessarily needed for building, but I think it's better to
have the same toolchain as the Qt SDK.

Task-number: QTBUG-101653
Change-Id: I92a319a943d18ec10e5e0da3cd770ba7cde26f13
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c76e26a5fa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-21 22:40:24 +00:00
Fabian Kosmale
f015cace95 Set QT_SUPERBUILD early
That will allow qtbase's .cmake.conf to check whether it is meant to be
used in a superbuild or only for qtbase.

Task-number: QTBUG-101640
Change-Id: I035c86f32497004cc1b8441456604106bacadad4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 14e486a8c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-21 16:10:27 +00:00
Heikki Halmet
e978441df6 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.

Change-Id: Ia3deb3011b0cb6a9e145d0f126d4ab6723ce79f3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 1cc99e61dd)
2022-03-17 15:03:21 +02:00
Assam Boudjelthia
f9ef0b811b Add Android tests to Qt modules - part 1
This enables testing for Android for the modules:
qtdeclarative, qtsvg, qtshadertools, qtimageformats.

Also replace the qtbase Android test target with
linux_android_tests.yaml.

Task-number: QTBUG-88846
Change-Id: Ibe0dcbdc5d468e884570bf4908f8ddee0793103c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 523eb8e1ea)
2022-03-15 21:31:52 +02:00
Qt Submodule Update Bot
4534f8f953 Update submodules on '6.2 in qt/qt5'
Change-Id: I8a4f06261797dd93c0ddb717c5950d16860c5470
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-14 23:52:58 +00:00
Pasi Petäjäjärvi
694a559c91 CI: Add ssl certificates for QNX
Expects Ubuntu 20.04 LTS with ca-certificates package installed

Change-Id: I9b439e9e049b93c3bba77573b491c336aee4af5a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 339a47b4ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-14 22:04:42 +00:00
Pasi Petäjäjärvi
08e40460b7 CI: Add network autotests support for QNX
Add regular UNIX network related files to configure
used test network based around QEMU and docker
services. IP address 172.31.1.1 is bridge interface
address in host which QNX tool mkqnximage set
(hard coded intool, cannot be changed).
Docker service hostnames are configured statically
as mDNS does not work from QEMU.

Change-Id: Id7be7867e5bea1f354456e8d440f9979c402e977
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 477877352a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-14 22:04:21 +00:00
Pasi Petäjäjärvi
4c219f7118 CI: Remove installation of QNX toolchain from linux platforms
These linux platforms are not used when building for QNX

Change-Id: I071834053b09b1cea962796076bb0cd2fc6e0fff
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c4869161b6)
2022-03-14 20:14:17 +02:00
Qt Submodule Update Bot
fadad113bc Update submodules on '6.2 in qt/qt5'
Change-Id: Id631dfdd858b3cb662dd04670818514d10e42146
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-12 04:52:01 +00:00
Assam Boudjelthia
285249f452 Rename the Android emulator to be more descriptive
Because we want to add Android 12 emulator for testing, it's important
to have a more descriptive emulator name. For this one, it includes
api_23 part.

Task-number: QTBUG-88846
Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a4cc949b8d)
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2022-03-11 19:30:34 +02:00
Heikki Halmet
6f0e2bb5f2 Fix Openssl android installation
Current provisioning installation is broken. Current package replaced
the old openssl-android-master-1.1.1m.zip and shasum changed.

Task-number: QTQAINFRA-4848
Change-Id: Id5e3bc1a81f8b634668d189c7647eac7c612020a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 96fe74b540)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-03-11 00:36:37 +02:00
Heikki Halmet
abc643a6cf Provisioning: Update OpenSSL to version 1.1.1m
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>
(cherry picked from commit 8732165461)
2022-03-11 00:36:33 +02:00
Assam Boudjelthia
96c4854fbe Coin: Fix Documentation target on tqtc/android-automotive
The Documentation target in tqtc-android-automotive.yaml has
-DFEATURE_cxx20=ON and 'TestDocs' flags which is not present in the main
cmake_platforms.yaml on this branch, this might have been the cause for
failing docs build under qtinterfaceframework.

Pick-to: 6.2.4
Change-Id: Ife84d424673cd7ccf82d0046839ebefa71305f0e
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-03-09 09:59:12 +00:00
Qt Submodule Update Bot
142870e283 Update submodules on '6.2 in qt/qt5'
Change-Id: I2a15e3188cac5d331c820ed4b837ed9578a8f02c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-08 19:05:06 +00:00
Toni Saario
5c95c956be Update git
Older git version does not allow fetching single specific sha1.

Change-Id: Ib795659a597042876a5c7b6fab3875fe1e39873d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit a2393b5882)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-08 08:56:54 +00:00
Qt Submodule Update Bot
3a7099ce84 Update submodules on '6.2 in qt/qt5'
Change-Id: Ic3eadb1a0499d97f014acfbb5046e2a0e6849604
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-05 06:17:11 +00:00
Alexandru Croitor
e821ee8320 coin: Split top-level build instructions
Makes it a bit cleaner to follow.

Change-Id: I063581126b6d09f98fb38862c8af5531dc513aca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a9c9418c8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-02 16:38:40 +00:00
Jani Heikkinen
e8d2407930 Update LICENSE.QT-LICENSE-AGREEMENT
Newest version is 4.4 so update it in the git as well

Task-number: QTBUG-98971
Change-Id: I55f06da7778fe8ce9c7c449cb2b011d37b97244c
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
(cherry picked from commit cbeea07854)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-01 08:11:28 +00:00
Heikki Halmet
6db8e9dc71 Add instructions how to create Windows 11 image with Virtio drivers
Change-Id: I9042667ed00ce6023168f501a2e695af3858780c
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a9eed4e535)
2022-02-22 08:04:22 +02:00
Heikki Halmet
7ba1b4a454 Provisioning: Run msvc 2019 update at the beginning of provisioning
When script was run with prefix 99 the installation process wasn't
finished before machine got rebooted. Moving the script at
beginning of provisioning seems to help with the situation. This is
not a proper fix but the best we have right now.
We can change this later if/when we find the root cause for this.

Task-number: QTQAINFRA-4813
Change-Id: Icbc2b0b33905990df611bdb494ed9b22801633fd
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 1597f43512)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-02-22 08:04:21 +02:00
Heikki Halmet
d542683972 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.

Change-Id: Ifb80aa4a93608b79faffc8c59002c89804f60570
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 88cde9e500)
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-02-22 08:04:19 +02:00
Heikki Halmet
07c40ad25b Provisioning: Install addtional Python 3.10.0 for Windows 10 21H2
Change-Id: Ic65b3b5b8dcea2ed918b005dbc8d4ea75daba61f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 6c0950edf8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-22 06:04:18 +00:00
Heikki Halmet
ac512afa0c Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Change-Id: I461a26cf258a3e5c62faf719612f643507662f72
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 73295cc05c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-22 06:04:18 +00:00