Commit Graph

4928 Commits

Author SHA1 Message Date
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
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
Alexandru Croitor
ec6e186d10 CMake: Pass QT_BUILD_EXAMPLES instead of BUILD_EXAMPLES
BUILD_EXAMPLES was the old way to disable building examples, which is
not used anymore. This should remove the warning about an unused
BUILD_EXAMPLES variable.

Pick-to: 6.2 6.3
Fixes: COIN-762
Change-Id: Icf88d617e564939bcff5047f83d029e93df16401
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2022-02-02 11:29:51 +01:00
Luca Di Sera
fc7251edfa Update _clang_format to avoid adding a space in list-initialization
The current style specification for clang-format will add a space
between an identifier and an initializer_list in list-initialization.

For example:

```
auto foo{bar};
```

Would be modified to:

```
auto foo {bar};
```

The Qt Style Guidelines (https://wiki.qt.io/Qt_Coding_Style) do not seem
to dictate anything about this case, while dictating about a general
use of scope-delimiting braces that, arguably, does not apply here.

Following a rationale that is similar to the one in Google's C++ Style
Guide (https://google.github.io/styleguide/cppguide.html#Braced_Initializer_List_Format),
"SpaceBeforeCpp11BracedList" is now set to false to avoid the addition
of the aforementioned space.

Change-Id: Ic499994a24293a634858889352c717248b8d11e3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2022-02-01 12:12:42 +00:00
Heikki Halmet
279841383d Make Windows 10 21H2 significant
Task-number: QTQAINFRA-4600
Pick-to: 6.3
Change-Id: I0ffe3f94bfef9c15a1cbc98cd0afed8bf33c68c1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-01-31 20:22:26 +02:00
Heikki Halmet
10897d6514 Change Windows 11 targets Insignificant flag to cover only autotests
Pick-to: 6.3
Task-number: QTQAINFRA-4673
Change-Id: Ia841fec1fe4adcedf0af2ddfeeb9a19fd915baf7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-01-31 20:22:24 +02:00
Alexandru Croitor
93afb606b4 CMake: Fix linux static tests config to actually run
In 3c38cc22ce the dash was accidentally
removed and Coin was happy with it.

Reintroduce the dash.

Pick-to: 6.2 6.3
Change-Id: Idc5d3833191b0390e2d0aa480681a5350d289037
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-01-31 17:48:31 +01:00
Joerg Bornemann
8a94d1e294 CMake: Rework inter-repository dependency resolution
In certain cases the dependency resolution between Qt repositories
resulted in a wrong order, for example qtsvg being handled before
qtbase.  See the linked task for an example.

Replace the existing algorithm with a post-order traversal of the
dependency graph to produce a topological ordering.

Rename qt_internal_add_module_dependencies to
qt_internal_resolve_module_dependencies and remove unnecessary
positional arguments.  Use keyword arguments for a nicer API.

Raise the cmake_policy in QtSynchronizeRepo.cmake to avoid policy
warnings we now would get due to the use of IN_LIST.

Fixes: QTBUG-98268
Change-Id: I1425fd9c802fa71ae42549ceb14bcfc4c0a62078
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-01-31 11:10:40 +01:00
Pasi Petäjäjärvi
4a5550cc03 CI: Increase size of QNX qemu image for data partition
Some of the autotest require more free space to pass

Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: Iff4a4493e75d2770d691b936547143518a80e315
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 11:34:01 +00:00
Pasi Petäjäjärvi
848a7d5fa3 CI: Add font support for QNX qemu
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 13:33:55 +02:00
Pasi Petäjäjärvi
7486226c7a CI: Enable developer build for QNX x86_64
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: I119f47ba0ee36a19a6daca05383c90304b34e97a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 11:33:48 +00:00
Pasi Petäjäjärvi
2592bbe8c4 CI: Update libraries because of new QNX toolchain
QNX toolchain provides newer libfreetype which depends on new libbz2
library (qnx710-20211207-linux.tar.xz).

Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: I4bcb0b536ace594dd95faeed8e5a8d99e53afadd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 13:33:34 +02:00
Fabian Kosmale
2d3ac423b4 Enable C++20 standard for Ubuntu developer builds
Gives more CI coverage against build failures.

Task-number: QTQAINFRA-4117
Task-number: QTQAINFRA-4242
Change-Id: Ib40007cc5f6b0295d165c4f64aa3bde135050b7a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-01-29 09:01:21 +01:00
Jukka Jokiniva
0c26ca7077 Add yaml file for Android Automotive
Change-Id: I1007453ba47e7a7be4fe60ef065695189eb44f98
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 06b5cd95e6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-28 08:06:03 +00:00
Jani Heikkinen
56dd3e2127 Add qtlanguageserver as a optional dependency for qtdeclarative
Fixes: QTBUG-99737
Change-Id: I9dd71496b6ea974003158ffdd3e651beed60c31d
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 2d329b06e1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-28 05:37:06 +00:00
Qt Submodule Update Bot
a1c576d6be Update submodules on 'dev in qt/qt5'
Change-Id: Icda71fd8609c2d6449c3d8eaa541c268f2622724
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-28 05:37:05 +00:00
Heikki Halmet
1e8939b4b2 Provisioning: Change installation order between libicu and gtk3
Gtk3-devel includes dependency which conflicts with libicu-devel.
Changing installation order should solve it

Pick-to: 6.3
Pick-to: 6.2
Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-01-11 13:47:26 +00:00
Toni Saario
81dcae4f93 Provision conan on arm macOS
Pick-to: 6.2 6.3
Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-01-07 16:46:29 +02:00
Heikki Halmet
854e478223 Remove Insignificant flags from Creator, flashing-wizard and saferenderer
Pick-to: 6.3
Pick-to: 6.2
Change-Id: If4941f00f51281df4f2f233bd89bfaf0d0ed5a0d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-01-04 15:22:37 +02:00
Heikki Halmet
ebb9836451 Add OPENSSL_ROOT_DIR for macOS Android targets
Enabling OpenSSL requires OPENSSL_ROOT_DIR environment variable.

Pick-to: 6.3
Pick-to: 6.2
Task-number: QTBUG-97243
Change-Id: I055c236d0f346ddc2e2aff873f2bd98cacfb5ec3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-01-04 07:51:16 +02:00
Heikki Halmet
000691d833 Make macOS 12 on ARM developer build tests significant
Pick-to: 6.3
Pick-to: 6.2
Task-number: QTQAINFRA-4649
Change-Id: Ia12310a3439058f706d55242ece5ee185073f7ce
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-01-03 12:57:54 +02:00
Heikki Halmet
d4cb44ad71 Replace .ci.local suffix with .ci.qt.io
Plan is to terminate .ci.local soon

Pick-to: 6.3
Pick-to: 6.2
Pick-to: 5.15
Change-Id: I8198ea744eeb91974569d47b2147f08b18f97f73
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-23 10:00:47 +02:00
Tor Arne Vestbø
b19b02173c coin: Move all builds over to macOS 12
Pick-to: 6.2
Change-Id: Ief01ca81cda49d518e910e01f70f78a5c8430ed7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2021-12-23 01:43:05 +01:00
Tor Arne Vestbø
ccf24d5f2a coin: Make macOS 12 on ARM packaging tests significant
Pick-to: 6.2 6.3
Change-Id: I6e89626e52f21d19e8665769b4d8f6ee9a54e537
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-21 11:02:35 +00:00
Tor Arne Vestbø
649592deea Bump qtconnectivity
Change-Id: I8b9ea944ed95d70a41fb7abcef199b77cb15d353
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2021-12-20 13:57:03 +01:00
Toni Saario
099f184880 Add qt-conan-common platforms
Pick-to: 6.2 6.3
Change-Id: I99c9b148d4a3b23acc8c4bbd36cd1ea9ad32eac9
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2021-12-20 07:39:22 +00: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
Ville-Pekka Karhu
fe35c4dbb0 macOS: Upgrade Xcode to 13.2
Task-number: QTQAINFRA-4607
Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ice52c8f4199e124d92b994cab38151dd712986bf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-19 14:39:54 +02:00
Ville-Pekka Karhu
20c580e5db macOS provisioning: Disable bluetooth
Pick-to: 6.2
Pick-to: 6.3
Change-Id: Ia981b4ab37a6ca15a566feb2fdc176253b419193
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-19 14:39:48 +02:00
Heikki Halmet
ccf269f5da Remove InsignificantTests flag from Windows 10 targets
Change-Id: Ib6ec59762f1188d1dc2a133fdf44628d47fd1b57
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-18 09:05:10 +02:00
Jani Heikkinen
b9a59fe113 Update latest qt license agreement
Pick-to: 6.2 6.3
Change-Id: Iee3b30b298bac748133daf3f0e58f8dab195a2fe
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
2021-12-17 10:44:46 +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
Pasi Petäjäjärvi
1cb9c1caef CI: Add image support for QNX qemu
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: If040af8d074e7e197449eb4be68507e83214d393
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-15 00:13:26 +00:00
Pasi Petäjäjärvi
10a443c181 CI: Add timezone support for QNX qemu
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: Ie27f53fbf68c656dfdd7ddba72ef1c991416faeb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-15 00:13:26 +00:00
Jani Heikkinen
f55b82ee1d Update qttools submodule
Change-Id: Ic538882d50ff40a94a7b05d8fbc10b52da61fdbf
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-12-14 14:53:27 +02:00
Heikki Halmet
71e7ed17a2 Provisioning: Install up-to-date google Chrome for Wasm auto tests
Task-number: QTBUG-99062
Pick-to: 6.2
Change-Id: Ib9ebcad5d9700c09d01d1ba23fed716d3a3cae4b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-14 09:37:27 +02:00