Commit Graph

4963 Commits

Author SHA1 Message Date
Assam Boudjelthia
807b259ea4 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
Pick-to: 6.2 6.3
Change-Id: Ic1048d0fadd551f42ef2d074b3b905cf3c8da339
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-03-29 21:32:22 +02:00
Alexandru Croitor
cae9fef6f0 coin: QNX is not warnings clean
WarningsAreErrors was accidentally added to a QNX platform config,
despite it not being warnings clean.
The integration still passed though, because Coin didn't add
-warnings-are-errors to configure when cross-compiling.
Even if it did, it would still not be enabled, because the CMake
integration is missing -Werror support for QNX.

Remove the feature from the QNX platform config so there is no
confusion.

Amends 4b5a972ae4

Change-Id: Id72e446b75283d02a9724d4fec1b54f692e94fde
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-03-29 19:00:56 +01:00
Pasi Petäjäjärvi
6f5c0fbdf0 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.

Pick-to: 6.2 6.3
Change-Id: Iadda2254d4a45e95f90523cae90518fa74b24d6c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2022-03-26 20:49:15 +02:00
Pasi Petäjäjärvi
c1e7cf5c25 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.

Pick-to: 6.2 6.3
Change-Id: I670d78a2a4362dc8d6faf271f2ad2a90ce2a8aa9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-26 11:31:35 +00: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
Cristian Adam
c76e26a5fa 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
Pick-to: 6.3 6.2
Change-Id: I92a319a943d18ec10e5e0da3cd770ba7cde26f13
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-03-21 11:50:50 +01:00
Fabian Kosmale
14e486a8c4 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
Pick-to: 6.2 6.3
Change-Id: I035c86f32497004cc1b8441456604106bacadad4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-03-18 12:18:54 +01:00
Simo Fält
5d53c917b0 Install python3.8 compatible wheels to wheel cache
Pick-to: 6.3
Change-Id: I42283e1aa9d731e86adccaef3baed25713c9b60d
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2022-03-16 08:16:40 +00:00
Kai Köhne
4b5a972ae4 Explicitly opt in to WarningsAreErrors
Use the WarningsAreErrors feature, instead of relying on
FEATURE_developer_build, to block changes that introduce compiler
warnings.

Task-number: QTBUG-101073
Change-Id: Iab3a64fb51ac22ea8474c7b53ef0c8087397b981
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-03-15 09:47:09 +01:00
Pasi Petäjäjärvi
339a47b4ed CI: Add ssl certificates for QNX
Expects Ubuntu 20.04 LTS with ca-certificates package installed

Pick-to: 6.2 6.3
Change-Id: I9b439e9e049b93c3bba77573b491c336aee4af5a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-14 09:01:00 +02:00
Pasi Petäjäjärvi
477877352a 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.

Pick-to: 6.2 6.3
Change-Id: Id7be7867e5bea1f354456e8d440f9979c402e977
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-14 09:00:55 +02:00
Pasi Petäjäjärvi
c4869161b6 CI: Remove installation of QNX toolchain from linux platforms
These linux platforms are not used when building for QNX

Pick-to: 6.2 6.3
Change-Id: I071834053b09b1cea962796076bb0cd2fc6e0fff
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-03-14 07:00:50 +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
Assam Boudjelthia
523eb8e1ea Add Android tests to Qt modules - part 1
This enables testing for Android for the modules:
qtdeclarative, qtsvg, qtshadertools, qtimageformats, qtlanguageserver.

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

Task-number: QTBUG-88846
Pick-to: 6.3 6.2
Change-Id: Ibe0dcbdc5d468e884570bf4908f8ddee0793103c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-03-08 17:03:43 +02:00
Ievgenii Meshcheriakov
e5ecdd605e Add pcsc-lite-devel to the RHEL 8.4 package list
PCSCLite is needed to enable optional PCSC support for QtNfc.

Task-number: QTBUG-97946
Change-Id: Id27eea5e28a88b03399b5c1d66ea6fe4d077ea43
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-03-08 16:03:43 +01: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
Simo Fält
e1f18be950 Provisioning: Make sure one can call virtualenv as module with python3.8
This will fix qtinterfaceframework's config test.

Pick-to: 6.3
Change-Id: Ifd2f52e27d31f140402d98861339ef5f7b253c23
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2022-03-07 14:52:48 +02:00
Simo Fält
171f29f091 Provisioning: Install additional Python 3.8 for RHEL 8.4
Pick-to: 6.3
Change-Id: Ic9893505d3805bcc3cbed972a95ce4a756e4c32a
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-03-04 07:29:53 +00:00
Alexandru Croitor
a9c9418c8a coin: Split top-level build instructions
Makes it a bit cleaner to follow.

Pick-to: 6.2 6.3
Change-Id: I063581126b6d09f98fb38862c8af5531dc513aca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-03-02 16:14:20 +01:00
Qt Submodule Update Bot
ad4484c1ba Update submodules on 'dev in qt/qt5'
Change-Id: I1ec8e7626705e4ffc14e8663c4fa27e9b4b7e8b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-01 06:15:02 +00:00
Jani Heikkinen
cbeea07854 Update LICENSE.QT-LICENSE-AGREEMENT
Newest version is 4.4 so update it in the git as well

Task-number: QTBUG-98971
Pick-to: 6.3 6.2 5.15
Change-Id: I55f06da7778fe8ce9c7c449cb2b011d37b97244c
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2022-03-01 08:15:01 +02:00
Toni Saario
28920cb7b4 Update conan profiles
Split the end user profile variants in two, e.g.:

linux-x86_64-gcc

->

  linux-x86_64-gcc  # 1
  baseprofiles/linux-x86_64-gcc  # 2

1) This is still the end user variant but this includes the
   counterpart from 3rdparty subfolder

2) This contains those settings and options that are needed
   for 3rd party depedencies like icu

Task-number: QTBUG-99213
Pick-to: 6.2 6.3
Change-Id: Ia6d7d9c5759848ff339cf8f50a40b10dfd9877d6
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-28 07:43:41 +00:00
Assam Boudjelthia
a4cc949b8d 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
Pick-to: 6.3 6.2
Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-23 19:22:22 +02:00
Toni Saario
ce51e1158a Add webos targets
Pick-to: 6.3
Task-number: QTQAINFRA-4518
Change-Id: Ib198a9ec02993be6eed92a2a6f9d80659fc9d5d7
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-22 08:16:48 +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
Toni Saario
a2393b5882 Update git
Older git version does not allow fetching single specific sha1.

Pick-to: 6.2 6.3
Change-Id: Ib795659a597042876a5c7b6fab3875fe1e39873d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-22 08:16:45 +02:00
Tony Sarajärvi
55f8095928 Update llvm-mingw to version 14.0.0 RC1
Task-number: QTQAINFRA-4805
Change-Id: Id83058d4b23494a4d29777c3a828c3585c61113c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-22 08:16:43 +02:00
Assam Boudjelthia
2fd91cfe5d Mark QtAA Android test as insignificant until proven to work
Make sure this doesn't block the repo, untill we have the whole
Android Automotive pipeline working.

Pick-to: 6.2 6.3
Change-Id: I1aaef98cb724c8e299b2adacce36d8e3f786b432
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2022-02-21 10:05:22 +02:00
Assam Boudjelthia
c36ce3dd49 Add Documentation tatget to tqtc-android-automoitve
Amends 69536e4b45.

Pick-to: 6.2 6.3
Fixes: QAA-1026
Change-Id: Ieed387fb20ec4ebf1a4fbd2633da9c9e98b0a60b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2022-02-21 08:05:02 +00:00
Heikki Halmet
73295cc05c Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Pick-to: 6.2
Pick-to: 6.3
Change-Id: I461a26cf258a3e5c62faf719612f643507662f72
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-19 09:03:53 +02:00
Heikki Halmet
1597f43512 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.

Pick-to: 6.3 6.2 5.15
Task-number: QTQAINFRA-4813
Change-Id: Icbc2b0b33905990df611bdb494ed9b22801633fd
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-19 09:03:51 +02:00
Tony Sarajärvi
82ecf74768 Update llvm-mingw to version 13.0.0
When Windows 10 and 11 were updated, this was missing

Task-number: QTQAINFRA-4593
Change-Id: I52c920a5fc791db2039469f2931fa6c941f67e1e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-02-19 09:03:48 +02:00
Heikki Halmet
6c0950edf8 Provisioning: Install addtional Python 3.10.0 for Windows 10 21H2
Pick-to: 6.2
Pick-to: 6.3
Change-Id: Ic65b3b5b8dcea2ed918b005dbc8d4ea75daba61f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-19 09:03: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
6cea45bfb8 Add passing targets as significant
There is still autotests failures in one Windows 11 target

Pick-to: 6.2
Pick-to: 6.3
Task-number: QTQAINFRA-4673
Change-Id: I2f7958a6da358069799db18143789c99bb3f4dac
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-18 07:23:08 +02:00
Volker Hilsheimer
2e4d6af574 Prune Linux configurations in CI
Remove the various FEATURE_xxx=off configurations, we don't support them
and if we break stuff, then those issues are easily fixed after the fact
and users relying on those combinations can provide patches. Most of them
are obsolete with Qt 6 anyway, as users can just not link against QtGui
or QtWidgets.

Also remove the -no-opengl configuration, with RHI it's mostly irrelevant
as there is very little Qt code outside of RHI that calls OpenGL APIs.

Combine the various other configurations into a single configuration
and remove subtle variations.

Pick-to: 6.3
Change-Id: Ia35713fc7373d54b82a11be14e2272ff011a51ab
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2022-02-17 05:59:29 +01:00
Dimitrios Apostolou
fba918784f Cleanup of QNX Coin platform config
Move TESTRUNNER setting to the coin platform config files in qtbase,
where it's configured for other platforms too.

Remove custom COIN_CTEST_RESULTSDIR. The build should put its
testresults logfiles where Coin expects them, and that is already set
correctly in platform configs found in qtbase.

Save the special environment that QNX needs to the env var QNX_TEST_ENV,
instead of the generic TESTARGS which might be overridden for other
purposes. QNX_TEST_ENV is now used by the script coin_qnx_qemu_runner.sh
defined in qtbase.

Change-Id: I86cd017c045f9c83f7c126828c8b6319df9b9d86
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-02-13 23:43:15 +01:00
Qt Submodule Update Bot
d11f7803f4 Update submodules on 'dev in qt/qt5'
Change-Id: Ic478dcb616b26d7b1a15662696331a33392f0a0c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-12 11:45:21 +00:00
Ievgenii Meshcheriakov
1044c10cab CI: Add platform config for qthttpserver module
The module is currently a qt extensions.

Task-number: QTBUG-100660
Change-Id: I33f223f4ac1d1ce0ed1d012e878be98168e97a31
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-02-11 12:04:59 +01:00
Topi Reinio
69b329a55f coin: Update provisioned qdoc, qtattributionsscanner binaries
Latest qdoc introduced a new command (\qmlvaluetype) used in
qtdeclarative documentation, as well as other fixes and
improvements.

Pick-to: 6.3
Change-Id: I6453468fb36dbe38d62f5eb9de74beffd568673b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2022-02-10 23:59:49 +01:00
Qt Submodule Update Bot
790989721d Update submodules on 'dev in qt/qt5'
Change-Id: I56ad311c1ad351514d0991a675f2fc451385ce0c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-10 22:59:48 +00:00
Assam Boudjelthia
69536e4b45 Update tqtc-android-automotive targets and add test target
The module is android specific and thus tests need to be disabled
for platforms other than Android Automotive.

Pick-to: 6.3 6.2
Change-Id: If7528bc0845c6266d77f94e8e6c7d0ba67075d1a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-10 14:56:05 +00:00
Joerg Bornemann
ce9f7751e3 CMake: Don't ignore repos without dependencies.yaml
While resolving inter-repository dependencies, we skipped dependencies
if their dependencies.yaml did not exist.  This is wrong.  Instead, such
repos must be handled as if they don't have dependencies.

Drive-by change: Clarify the dependencies result value in the comment
for qt_internal_resolve_module_dependencies.

This amends commit 8a94d1e294.

Fixes: QTBUG-100549
Change-Id: I523ed74cfa96a4bab238f3a475f28c3ac55dd7b4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-02-10 13:43:11 +01: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
3f263aa742 Move bluetooth script under correct platform folder
Pick-to: 6.3
Pick-to: 6.2
Change-Id: If1c873bb3334639477e43f8d5d83d62338f6f4c0
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-02-05 15:59:15 +02:00
Heikki Halmet
ac2bdfb93a Remove old Windows 10 targets
Windows 10 21H2 is now significant for all targets

Pick-to: 6.3
Task-number: QTQAINFRA-4539
Change-Id: I9435c11f7df6b7c2c77a5af10ebc5e0da5717ccb
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-04 08:17:33 +02:00
Heikki Halmet
0e641142c1 Make Win 10 21H2 Environment variables to match with the old Win 10
Fix few differencies. E.g. Conan env variables are missing

Pick-to: 6.3
Change-Id: Id08c422b1df61c2acaf59cf2bcdb0cc55cdcb1e7
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-02-04 08:17:15 +02:00
Heikki Halmet
72997d7039 Upgrade Xcode and Command Line Tools version to 13.2
Xcode 13.2 works only in macOS 11.3/12.0 or newer

Task-number: QTQAINFRA-4607
Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ic2034a2091a041a6daa0f342e5820641488c068b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-02-03 21:13:09 +02:00
Heikki Halmet
1865d70ef8 Provisioning: Start using latest macOS 11 version 11.6
New tier 1 image's name format is qtci-macos-11-x86_64

Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ieb23b64a0981bdd282d2ae482dd5ccda3f7ecaed
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-02-03 21:13:07 +02:00