Commit Graph

5140 Commits

Author SHA1 Message Date
Mårten Nordheim
032a0e18bf Specify where to find protobuf on macos
Otherwise it doesn't find it and the build is configured without it.

Change-Id: Ib6b151c1177b4bde0de268f0a948a9a31f3a7225
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
2022-10-26 14:01:26 +00:00
Amir Masoud Abdol
d3460c1f23 Enable CMAKE_MESSAGE_CONTEXT_SHOW
This enables the CMake Message Context across the qt5 repo. Some of the
messages were changed from NOTICE to STATUS so that the output looks
more coherent and aligned.

Change-Id: I4c9104479dd2af31da29cf8cfd20fdc77252d404
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-10-26 08:20:01 +02:00
Amir Masoud Abdol
a427b5203b Sync CMake Version with qtbase/CMakeLists.txt
Syncing a few hard-coded versions that we have, to all have the
upper-bound of 3.21.

Change-Id: If8428f850d2df9767a359481db2b7b836843eca5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-10-26 06:19:47 +00:00
Amir Masoud Abdol
a99e917f88 Remove an unnecessary quotation in loading a CMake module
This isn't a variable, so it shouldn't really be necessary, unless I'm
missing something.

Change-Id: I24c31d1408c1445684b55dd3b87036b57f20b8e4
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-10-21 14:45:34 +02:00
Paul Olav Tvete
64a715e8be Make qtmultimedia depend optionally on qtquick3d
Needed for spatialaudioquick3d.

Pick-to: 6.4
Change-Id: I2bbfe1a23622deb90e7641b322ad9eac3ae4a112
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2022-10-21 06:36:24 +02:00
Samuli Piippo
d3857df3b2 Add platform configs for Qt Insight Tracker
Pick-to: 6.4 6.2
Change-Id: I5818b94e0c3cc706ca87935b7292714c1313a641
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-10-20 07:58:25 +03:00
Tony Sarajärvi
da78e8832d Update LLVM MinGW to 15.0.0
Task-number: QTQAINFRA-5214
Change-Id: I5ae09182dfbafdeaa8d23acf3d7c9cca0ca5f108
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-10-17 19:47:14 +03:00
Mårten Nordheim
cfef190a9d Remove protobuf provisioning for x86 windows
Since it's not used in any way for building Qt and breaks
provisioning where it is used.

Change-Id: Ib20e24274498c8b55658ac409f9644ce3c598864
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-17 18:47:12 +02: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
Qt Submodule Update Bot
8e21501ac7 Update submodules on 'dev in qt/qt5'
Change-Id: If9d414980d71b9188f9c5f157d61a7309ca22041
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-15 05:56:19 +00:00
Toni Saario
917f0fddd9 Make static IOS tests insignificant
Target blocks qtbase after eee152ca70
integrated. While 7390b668cd9ed7035f0b70d80476c11a480a1f15
is blocked by other issues, make target' tests insignificant to unblock
qtbase.

Change-Id: I84829e3588dc3d7ff593c27ba83abea5a667366d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-10-14 11:00:58 +00:00
Ville-Pekka Karhu
3ffc302ca2 Provisioning: Update to Xcode 14.1 beta 3 on macOS 13 ARM
Change-Id: If7cacf8118fff3e7e14d4cad68c886732d54d4c5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-10-13 13:32:50 +03:00
Mårten Nordheim
cc3feebb49 Add qtgrpc.yaml coin platform config
Change-Id: Ic547a1a6c3d5243bc42f9dec83626a1f3ee1ab07
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
2022-10-13 10:48:38 +02:00
Joerg Bornemann
53cb7139be Provisioning: Install patchelf on openSUSE 15.3
On this platform we test CMake 3.16, and for that we need the patchelf
tool.  Otherwise, the CMake deployment test will fail when trying to
set rpaths.

Change-Id: I2418390ba0776a19c5ab19042f3b8c4e12db6ecb
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-10-12 07:03:03 +02:00
Ville-Pekka Karhu
eee152ca70 Provisioning: Update to Xcode 14 on macOS 12 Intel
Change-Id: I95e0c590b74f14aec4fd16a104e429a64c442414
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-10-11 14:16:29 +00:00
Heikki Halmet
9255466d9f Provisioning: Use OpenSSL 3 version with Red Hat 9
OpenSSL 3 is default version when installing OpenSSL with yum. We need
to use OpenSSL 3 also with Android

Change-Id: If283c68d00d9a41131044fe245b5e84b39fd4744
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-10-11 17:16:18 +03:00
Heikki Halmet
5398865f8a Remove unneeded Rhel 9 targets
Arm64 target uses macOS and Armv7 target uses Windows nowadays

Change-Id: I1ec5251902f9a839e5be981a527a9eb6e1c98939
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-10-11 17:16:14 +03:00
Tatiana Borisova
52d2df3a61 Update GHS compiler version to v2022.1.4
- the latest patch_20196 (UTF-16 fix) is applied

Pick-to: 6.4
Change-Id: I0324c635b594f2a79604a36f962cca82e8a5de97
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-10-08 18:31:13 +03:00
Heikki Halmet
d45c78212a Use updated macOS 12 tier1 image with Android
Use templates which have Accessibility enabled for Squish.

Pick-to: 6.4
Task-number: QTQAINFRA-3559
Change-Id: If3c1a68a475149efdeb3bfd19efd6edaea411167
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-10-07 12:21:18 +03:00
Qt Submodule Update Bot
ef2b744c24 Update submodules on 'dev in qt/qt5'
Change-Id: I325465eadd82ed505087fc00ac43331669027654
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-07 00:28:50 +00:00
Liang Qi
eee7fde8a8 Provisioning: Install xcb-cursor libs and headers on RHEL9
This amends e679091f50.

Task-number: QTQAINFRA-5067
Change-Id: Ie3b6311944868022087be8cc56fdc66c53b95a44
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-10-06 12:47:20 +02:00
Volker Hilsheimer
905a2a9571 Remove unique Android configuration from qtdeclarative.yml
The configuration is not used to test qtbase, so dependency updates
might fail if changes already in qtbase do not pass when then updating
dependencies of qtdeclarative.

This happens right now in
https://testresults.qt.io/coin/integration/qt/qtdeclarative/tasks/1677711115

If we want to enable this configuration anywhere we need to add it to
qtbase, or ideally the default list of platforms in cmake_platforms.yaml.

Pick-to: 6.4
Change-Id: I3f5614d34def41caf1747a5f8094bac3aa2d9e2b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-09-29 18:57:35 +02:00
Johanna Äijälä
3e380e35b0 Update macOS11 (105) and macOS12 (105) templates
Use templates which have Accessibility enabled for
Squish.

Task-number: QTQAINFRA-3559
Pick-to: 6.4
Change-Id: I9538ea48791ea81738a41b1e101552cfc3bd454b
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-09-29 10:04:19 +03:00
Edward Welbourne
74fc1bcaec Remove stray first line from provisioning script
Having a blank line before the shbang makes the shbang not work.

Pick-to: 6.4
Change-Id: I523c4eab8746da2b898eacf3f54f73d63dbd2786
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-09-28 18:38:03 +02:00
Assam Boudjelthia
9e9f3e513b Coin: Fix includes in tqtc-android-automotive configuration
This broke after 8899244b8c which
unified the Android targets into one config file.

Pick-to: 6.4
Change-Id: I9b24973ddf716f97e72d152387365c35405e0502
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-09-28 13:59:28 +03:00
Mårten Nordheim
9c1349047e clang-format: codify some of our conventions
1. We tend to use 2 spaces for indenting pre-processor directives,
when we do it. Unfortunately clang-format also counts header-guards
so not really recommended to use blindly on a header...

2. Add comments to namespaces, since the closing brace is simply
a brace with no further decoration.

3. Attach escaped new-lines on the left (instead of current: right).
Where 'right' will add the '\' characters on the far-right of our column
limit, 'left' will put them as far left as it can while having them
vertically aligned.

Change-Id: Ib5a836c76f7761d743e0100c83e7db609b959249
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2022-09-28 11:42:29 +02:00
Qt Submodule Update Bot
f8feb285c2 Update submodules on 'dev in qt/qt5'
Change-Id: I93a29c4cd8642aa64bf434abba05b4872f90542d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-28 07:26:50 +00:00
Liang Qi
b5bd0f1871 Remove TestDocs in Ubuntu 22.04 nightly build
qdoc_qtattributionsscanner was also removed.

When we have TestDocs in the future, we need to rebuild
qdoc_qtattributionsscanner for Ubuntu 22.04.

Task-number: QTBUG-106948
Change-Id: I56bfda453cfddae97fa03b2a5eca91548152afe5
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2022-09-26 15:17:31 +02:00
Ville-Pekka Karhu
0c92132388 Provisioning: Rename macOS ARM folders
Change-Id: Ic70b6d56e84f5ae4718d1dc9edaed64abbbc3735
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-26 15:11:25 +03:00
Toni Saario
5e24ed72b0 Precheck: Fix macos android include
This broke after 8899244b8c.

Pick-to: 6.4
Change-Id: I5cfdb2e94c8b170faba52631d9ee52cdcf7e0b36
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-09-26 10:00:07 +03:00
Liang Qi
984cecfce1 Revert "Add InsignificantTests flag for openSUSE 15"
This reverts commit 7dcf1c8a4b.

tst_QNetworkReply::contentEncodingBigPayload() got fixed by new round
of qt5 submodule update on openSUSE 15.

Change-Id: I76de6742d0782dc1cef387c7f7ec2a7757fb5489
Reviewed-by: Liang Qi <liang.qi@qt.io>
2022-09-26 04:47:36 +00: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
Johanna Äijälä
db68763094 Provisioning: Add Java 11 to Ubuntu20.04
Needed by RTA when compiling Android applications, minimum required
Java is 11.

Pick-to: 6.4
Pick-to: 6.3
Pick-to: 6.2
Change-Id: I9a64e8de322a576d5d94593b5666d72afea8744f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-24 11:10:25 +03:00
Qt Submodule Update Bot
11585aca97 Update submodules on 'dev in qt/qt5'
Change-Id: Iff74e859d1aec1f3bd066977ff22291f2eb6e0d0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-09-23 12:28:41 +00:00
Ville-Pekka Karhu
c1a1e65cdc Provisioning: Xcode update to ARM macs
Change-Id: I71828f5b126c6243163238aef2000dfb91cdbcb2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-23 12:50:27 +03:00
Liang Qi
7e7c23669c provisioning: fix mdns to support both docker and network tests
Network tests require the system resolver to resolve IP addresses
back to host names, but "mdns4" seems to be unable to do that, and
instead prevents "dns" from doing its job. So we place it after "dns".

Done-with: Dimitrios Apostolou <jimis@qt.io>
Done-with: Thiago Macieira <thiago.macieira@intel.com>
Fixes: QTBUG-106013
Change-Id: If0379cf5f42b41964cf156cdf8691dbcfcc0275b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-09-23 06:23:55 +00:00
Jani Heikkinen
8899244b8c Build android target binaries only once
- android armv7 is build only in windows
- android arm64 is build only in mac
- android x86 and android x86_64 are build only in linux

Task-number: QTBUG-101357
Pick-to: 6.4
Change-Id: Ibfbd2e3c6d5d3a7a52dde3b35ca6c23eddf4b2f1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-22 13:42:42 +03:00
Heikki Halmet
b51d7ca210 Fix Android NDK root environment variable for RHEL 9 nightly run
Change-Id: I5e3ff1fd8d339cc42b5f20ea3f91d5a8ecc92c71
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-09-21 15:05:50 +03:00
Heikki Halmet
bf1c196e41 Provisioning: Install Node.js for SLES 15
WebEngine requires node.js version 12 or later

Pick-to: 6.4 6.2
Change-Id: I9ff5ebbfcaf328445149e6d0b95e02dd0febf5c3
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-09-21 12:58:53 +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
Heikki Halmet
911505cd37 Provisioning: Fix Protobuf installation for Ubuntu 22.04
Cmake environment variable need to be read from .bash_profile
(or .bashrc) instead of .profile with Ubuntu 22.04

Change-Id: Ic0589666e48946ba05366304407a0e5824b27a2c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2022-09-20 07:30:03 +00:00
Heikki Halmet
de8a8879bd Add Ubuntu 22.04 xwayland to Nightly build
Change-Id: Ic9878e4223e77a49df4daab2514e516b7b46545f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2022-09-20 09:30:01 +02:00
Heikki Halmet
7dcf1c8a4b Add InsignificantTests flag for openSUSE 15
New provisioned openSUSE will start failing to
tst_QNetworkReply::contentEncodingBigPayload. This should be fixed in
QTBUG-106016 but requires Qt5 submodule update which is blocked currently.
Meanwhile let's use Insignificant flag for openSUSE autotests to get
provisioning changes in.

Change-Id: Ib9a8b61f35f6e105440308af44c2d96605ea3b27
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-09-20 10:29:59 +03:00
Ville-Pekka Karhu
982b8ddb3d Pre-provisioning: macOS 12 README update
Pick-to: 6.4 6.2
Change-Id: I43194f6b2d7d6b1be74333fb9e9282adb49ed6fc
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-19 09:09:44 +03:00
Alexey Edelev
15c3907d68 Disable top-level builds for platforms with the TargetBuildOnly feature
TargetBuildOnly builds are broken, since host Qt is not provided and
tools cannot be run correctly for top-level builds. Temporary disable
them.

Task-number: QTBUG-87480
Change-Id: I996e1300cab6bd1383333c686a67e00b55829e5f
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-09-16 15:35:05 +02:00
Alexandru Croitor
06e1b81a7d Add Windows CI platform configurations for the qmake2cmake repo
Change-Id: Id21cc5c62e51fa3f1041e76201f4a6c914eb5e1e
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-09-16 07:29:30 +00:00
Toni Saario
d5381608ba Run bic tests
The way of running bic tests has changed. Now tests need to be run on
qt5 level where all modules are present and intermodule includes can
be handled.

Task-number: QTBUG-100698
Change-Id: Ic68c019988718485201602f279530c501f6e6ba3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-09-15 08:54:31 +03:00
Mårten Nordheim
0770d0db8f Update protobuf script for macos 13 arm
Amends ad84c5cb8a and
134c07923c

Change-Id: Ia0f63d4e2cfe106c4ddfa63fe98609209e7a3b78
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-09-13 10:24:38 +02:00
Topi Reinio
505eb9e3a8 coin: Update provisioned qdoc, qtattributionsscanner binaries
Latest qdoc introduced a new command (\modulestatus) as well as other
fixes and improvements.

Pick-to: 6.4
Change-Id: Idcbd96bc1ec17c81d51c2413f6435ee1b7e12946
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2022-09-12 10:14:34 +02:00
Heikki Halmet
1661a1c50c Fix link to common protobuf script
Protobuf script name was renamed recently

Change-Id: I9bafc35524a5bf89ca5d91b7649eb6641845792c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-09-12 10:01:49 +03:00