Commit Graph

5184 Commits

Author SHA1 Message Date
Jani Heikkinen
0a49fc9d7d Add qtquickeffectmaker submodule
Task-number: QTBUG-108164
Change-Id: Ie3887bc420a0451e40a64afc14273ed40790c99f
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2022-11-24 18:58:44 +02: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
Jani Heikkinen
d4cc1708ba Change qtlocation from 'ignore' to preview
Task-number: QTBUG-108726
Change-Id: I13ff5af38c846358a9091ce4e0ca3100b4054b39
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-11-24 09:14:18 +02:00
Jani Heikkinen
27dd0c29fe Qt6: Build wasm target binaries only once
non-threaded Wasm build will be built only in windows.

threaded wasm build will be done in macOS.

thread-asyncify wasm build will be done in linux.

Change-Id: Ibea96aca1ec4ce15c632ba2f4223d898f6ebffaa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-24 09:14:04 +02:00
Rami Potinkara
0b88c1e2f0 Make qtwebview significant for Android 12 emulator in CI
Needs blacklisting of tst_QQuickWebView::settings_JS

Task-number: QTBUG-108752
Task-number: QTQAINFRA-4733
Change-Id: Icf3ed9f223195d602b1c28c42afb26e53157fec8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-11-24 05:09:39 +00:00
Samuli Piippo
2b8f50a2d1 Add universal libusb binaries to macOS
Brew does not support universal binaries, but provides separate
amd64 and arm64 packages. We need to add arm64 binaries for libus,
so that the universal builds work also for QDB.

Use brew to fetch both architecture packages and use them to
create universal libs for the libusb.

Remove from macOS 10.14, add to macOS 12 arm.

Task-number: QTBUG-107457
Pick-to: 6.2
Change-Id: If19fd6d303a20d8742c88ea11d5b30cc55f45d6b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-11-24 05:38:38 +02:00
Alexey Edelev
ab0b005a57 Add the missing additional CMake host prefix to Android and WASM platforms
Add QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH for Android and WASM
platforms to allow CMake find the host qtprotobufgen. The prefix points
to a host Protobuf package which qtprotobufgen depends on.

Change-Id: I2250614dceafb4b93a8a13ddb549f4ecc459436b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-23 20:07:51 +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
Mårten Nordheim
1c09ad4cf8 Fixup protobuf provisioning scripts on linux machines
Amends 134c07923c

Change-Id: I53ddfc390068dd7ed5ab3867c632027c0b9b24f2
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-11-23 07:54:34 +01:00
Heikki Halmet
a66995e175 Make ASAN target to use latest openSUSE 15.4
Task-number: QTQAINFRA-5049
Change-Id: I390221f9cd347ad3b4ebf038bc392d8d7b8411e9
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2022-11-20 06:13:50 +00:00
Topi Reinio
9e4e6a565a Provisioning: Restore qdoc/qtattributionsscanner binaries on Ubuntu 22.04
The binaries were built on Ubuntu 20.04 and need a specific version of
libicu to work. Temporarily install libicu66 to be able to use common
binaries on both 20.04 and 22.04.

Change-Id: Ibb0bec24f1451ec48a79c6c978256c9d1474adee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-18 22:06:27 +00:00
Heikki Halmet
e9b3497c8e Add Windows 10 22H2 to CI
Pre-installed to tier 1:
          MSVC 2022 17.3.6 plus build tools
	  MSVC 2019 16.11.20 plus build tools
          MSVC 2015 update 3 14.0.25420.1

Task-number: QTQAINFRA-5262
Change-Id: Ibcc2950dd7edef0d6aa92cef7e602a69da8498d9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-11-18 08:34:53 +00:00
Heikki Halmet
3d05c67749 Add Windows 11 22H2 to CI
Windows 11 21H2 will be replaced by 22H2 version

Task-number: QTQAINFRA-5203
Pick-to: 6.4
Change-Id: Iad18055cf84d9c1ff38984611c820b1c23d663a2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2022-11-18 08:34:51 +00:00
Jani Heikkinen
b3b41c2ef7 Add qtgrpc submodule
Task-number: QTBUG-107916
Change-Id: I41d6436b92941efa614fa6b6d5ed31a7c3bc7e5a
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-18 05:28:39 +00: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
Topi Reinio
31c4ad1686 coin: Update provisioned qdoc, qtattributionsscanner binaries
Update qdoc to a version that queries system include paths from the
compiler, avoiding spurious documentation warnings in some environments.

Update qtattributionsscanner to a version that fails the documentation
build on incorrect input, i.e. incorrectly formatted qt_attribution.json
files.

Pick-to: 6.4
Fixes: QTBUG-108353
Change-Id: I3a64f7810cddafcbf9de66bd1d848c18f5677ad0
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2022-11-17 19:20:31 +00:00
Jani Heikkinen
f1f5b612ff Enable CI for qtquickeffectmaker.yaml
Task-number: QTBUG-108162
Change-Id: I39fe28ba6eb8e65ef5c4c3d08343ff72f349bd22
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2022-11-16 12:43:06 +02:00
Alexey Edelev
8f6cdc23be Add Android Multi-ABI CI preset
Add the minimal test preset for Multi-ABI Qt for Android.

Change-Id: Ic534daa5cea823b08b718f43ece637f9f9b375d9
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-11-15 14:08:39 +02: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
Tor Arne Vestbø
7db5511fe6 Make macOS 13 Apple Silicon test significant
Task-number: QTBUG-104210
Change-Id: Ib75931616718406d1dd8a2476f8566ef15257d4a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-11-11 15:56:30 +01:00
Tor Arne Vestbø
2586e0f3bd Add macOS 13 on Apple Silicon as insignificant platform (for now)
Task-number: QTBUG-104210
Change-Id: Ic9f6a1b0a93e762a643fb98d31d1a3b82bdd61ea
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2022-11-11 09:53:30 +01: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
Qt Submodule Update Bot
a523008ed4 Update submodules on 'dev in qt/qt5'
Change-Id: I2e4e87607275207c9ef98fbcfed5bfc17d3f88ca
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-10 04:36:14 +00:00
Kai Köhne
4ad2ac317c README.md: Remove Ruby requirement
Change-Id: Ibda0781586f0daf3c7a8dd0a7b2032b7da0fa54b
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
2022-11-10 04:36:12 +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
Heikki Halmet
12f0f9e0e5 Specify insignificant for Android 12 emulator on submodule level
QtBase and QtWebview have still autotests failures with Android 12.
While waiting fixes let's prevent regression in other submodules
by adding those as blocking (significant).

Task-number: QTQAINFRA-4733
Change-Id: I6640e65b7efa5698557f97f1e195d50d58a41680
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-11-09 06:08:23 +00:00
Heikki Halmet
20c8f11006 Provisioning: Update Xcode version to 14.1
Command line tools are also updated

Pick-to: 6.4
Change-Id: Ic1d0882d395e014a4f33ed139c90800b3ba71cbf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-11-09 06:08:20 +00:00
Assam Boudjelthia
b7ea626a07 Add Android 12 emulator for CI testing
Add Android 12 emulator to make sure tests are verified
on a recent Android release. Android 12 has only x64 emulator
version from sdkmanager and x86_64 is better in any case.

This patch only adds the emulator, but doesn't enable its use,
that is done under another patch.

Task-number: QTQAINFRA-4748
Task-number: QTQAINFRA-4733
Change-Id: Ic1569fb1afa5b2d02e6eadea1d9a8eac0a378d98
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-09 06:08:17 +00:00
David Skoland
4a6f43ed8d wasm: Add actual emscripten installation to path in coin
I'm not sure where the emscripten-$version came from, maybe that's
how it used to be? In any case, in the current version (3.1.x),
the installation folder is in upstream/emscripten, so add PATH
there to access all emscripten utils.

Pick-to: 6.4
Change-Id: I648feae21bc5caecc3f0bf0a7d16238680a85590
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-11-09 07:08:15 +01:00
Heikki Halmet
9c21dd75d2 Add openSUSE LEAP 15.4 (KDE) to CI
Graphichs Platform: X11 (System default) in image with suffix 50
Graphics Platform: Wayland (Plasma (Wayland) in image with suffix 51

Pick-to: 6.4 6.2 5.15
Task-number: QTQAINFRA-5049
Change-Id: If4b208bc12bd272c757aac61ffc9ef7a88df8f7c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-11-04 15:31:36 +00:00
Qt Submodule Update Bot
f5db93cd6d Update submodules on 'dev in qt/qt5'
Change-Id: Icf6e0775024bae53936ee975d0379cbda98dbd3b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-04 03:54:12 +00:00
Morten Sørvig
f84d1d36a9 wasm: add multithreading configuration variants
Add FEATURE_thread=ON variant, with packaging enabled.

We now build the following configurations:

  "webassembly"                  (all desktop hosts)
  "webassembly-thread"           (all desktop hosts)
  "webassembly-thread-asyncify"  (linux, for auto tests)

Change-Id: Iac212b350ed4a5551c00df4ac1cd579a1ccd05f2
Reviewed-by: David Skoland <david.skoland@qt.io>
2022-11-03 15:26:49 +01:00
Morten Sørvig
ed0e882396 Make sure all wasm configurations have an Id
The format is "webassembly-host-config".

Change-Id: Ibb360d8ea41cb50f7a1c6411432ac9df0200398a
Reviewed-by: David Skoland <david.skoland@qt.io>
2022-11-03 15:26:43 +01:00
Heikki Halmet
1a91aa20ac Provisioning: Fix for checking the installed Android openssl version
Pick-to: 6.4
Change-Id: I2b180772da0e16aa69c7044eacc9c8ee617c6217
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-11-02 07:06:24 +00:00
Qt Submodule Update Bot
15782e70b4 Update submodules on 'dev in qt/qt5'
Change-Id: Ib27b9e355c9080aeec75aa952b9caaf0df6a6ec6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-11-01 22:48:05 +00:00
Artem Dyomin
047ac67b06 Turn on ffmpeg build and ffmpeg tests for all macos platforms
Some tests have been skipped for mac os CI, see
related commit by gerrit topic.

Example of build/test:
https://testresults.qt.io/coin/integration/qt/qtmultimedia/tasks/web_qt_qtmultimedia_1666965369638

Change-Id: I9aeb4d608d15733bce9b97e35b3b9c2e049af3f0
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-11-01 22:13:28 +02:00
Heikki Halmet
2fb9e7d576 Pre-provisioning RHEL9: Make needed changes for autotest
* Disable all notifications
* Disable Hot corner and windows key from showing the GNOME
Shell Activities overlayfeature.
* Switch to use GNOME Classic: Autotest start failing because
terminal session remains in Activities Overview when using
Standard (wayland display server)

Task-number: QTQAINFRA-5111
Change-Id: Id0cd7e53cfad08313b9c0b622f2f9de8240448f3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-11-01 08:32:56 +00:00
Jani Heikkinen
a4db1a62b8 Qt6: Build wasm target binaries only once
Wasm will be built only in linux and those same binaries will be used also
in macOS and Windows.

Change-Id: If94098df624ab718491b9407c456d75ce7c7b117
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-11-01 05:18:44 +00:00
Kai Köhne
bc689f30ac Update required tools for building Qt
* Only Ninja generator is officially supported
* qtdeclarative requires Python 3
* We do not require Perl anymore

Also fix some spelling & links.

Change-Id: Ifc4685a17fc5f24d13f1e3572d9318929cff9987
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-10-28 12:32:00 +02:00
Heikki Halmet
c383d0fc91 Nightly builds: Add NON_QTBASE_TARGET_CMAKE_ARGS to qnx windows target
Other modules don't include needed flags

Change-Id: Id4525fa9887afff2ee6baed64f217167f545a2f5
Reviewed-by: Tommi Mänttäri <tommi.manttari@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-10-27 12:08:01 +00:00
Heikki Halmet
c90e16bceb Provisioning macOS 13: Upgrade Xcode version to 14.1_Release_Candidate_2
This will also upgrade Command line tools

Change-Id: I9425170ceb2f09ec74fdb70ab6101804aa1d31fe
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-10-27 11:26:33 +00:00
Qt Submodule Update Bot
71336b7a68 Update submodules on 'dev in qt/qt5'
Change-Id: I244639d8229a77687bf9a6800e35363aa64df64a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-10-27 06:09:32 +00:00
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