Commit Graph

5006 Commits

Author SHA1 Message Date
Kai Köhne
fe9efd3594 Fix C++ version to C++17
Cpp11 is nowadays a deprecated alias to LS_Latest

https://clang.llvm.org/docs/ClangFormatStyleOptions.html

So we might as well hard-code it to C++ 17.

Change-Id: If832c6075f9e30c340a2ac8bb3b7fe13afc0f56e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2022-06-08 10:25:30 +00:00
Joerg Bornemann
7ff98181a8 Use QT_FORCE_BUILD_TOOLS=ON for qemu CI builds
...instead of the deprecated QT_BUILD_TOOLS_WHEN_CROSSCOMPILING
variable.

Change-Id: I849d19581826007227ce7c2ddccbce28913ec0f3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-06-08 10:33:17 +02:00
Toni Saario
43a461de46 Coin: Add precheck yaml
Defines configurations that will run on default precheck.

Pick-to: 6.3 6.4
Change-Id: Idb7d3981b2679c3714f86a92808e90fe33aaf136
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-06-07 13:18:41 +03:00
Tatiana Borisova
2046e36ee9 For qglobal.h: include <stdalign.h> in C mode C11 support is required
- add C11 standard in use by GHS compiler

Change-Id: Ied36da57617897c0c2553b6e2a9dd1206ca65d34
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-06-03 13:35:55 +03:00
Qt Submodule Update Bot
c12065ac78 Update submodules on 'dev in qt/qt5'
Change-Id: I3d4b041b668dcefbe9335fda4ad9bae90b319959
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-01 12:42:30 +00:00
Lorn Potter
b6b127c2d9 wasm: update emscripten version to 3.1.10
Qt 6.4.0 will require emscripten 3.1.10

Change-Id: I9411902674104aae8f4ba3b6af11e9956932d6b9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-05-27 08:31:33 +10:00
Jani Heikkinen
b1a7f2e737 Add qtquick3dphysics submodule
Task-number: QTBUG-103176
Change-Id: Id84b70e33a65d45734e9725628f5d5edfeef6bb6
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-05-25 08:16:26 +03:00
Simo Fält
0c85cce1b3 Provisioning: Install additional python3.7 for Windows 11
Pick-to: 6.2 6.3
Change-Id: Ia8ba4cee4efd6e9c8ffe5403879ad585b6e97576
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2022-05-25 06:42:25 +02:00
Allan Sandfeld Jensen
21ed2db77b Test universal builds on arm64
Change-Id: I2c2cc2a58cd954c8884955cd8bed79a961ef901b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-05-25 05:42:22 +01:00
Assam Boudjelthia
178334bd29 Coin:Android: Enable tests for more modules - Part 4
This adds tests of more modules:
qtcharts, qtspeech, qtwebchannel, qtwebsockets, qtdatavis3d

Pick-to: 6.2 6.3
Task-number: QTBUG-88846
Change-Id: Ie98ad9af7c260a72e9309836b7733106254da38a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-05-19 08:32:18 +00:00
Andreas Buhr
fb2ad5889e Activate testing of developer build for Android in qtdeclarative
Pick-to: 6.2 6.3
Fixes: QTBUG-101865
Fixes: QTBUG-102943
Change-Id: Ib6a2345f77b52749c5e7945d19e2eaa52e311758
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-05-18 14:29:34 +02:00
Qt Submodule Update Bot
2580f6984f Update submodules on 'dev in qt/qt5'
Change-Id: I95a31bf8725337e37938f49b4799b6e21f22622c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-16 14:51:22 +00:00
Jani Heikkinen
e70c24cd88 Add qtquick3dphysics platforms
Task-number: QTBUG-103174
Change-Id: Ic72f8a6b0d72ade656a39165c8feeaf01d73f51b
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2022-05-13 11:53:46 +00:00
Qt Submodule Update Bot
22b2c116c6 Update submodules on 'dev in qt/qt5'
Change-Id: I2ebacc15027622ea49ac125870fcf5d86c7090e1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-05-13 00:45:23 +00:00
Jani Heikkinen
19ecbff332 Add tqtc-qtvncserver platforms
Task-number: QTBUG-103163
Change-Id: Ifb2fe0842afa5077bd52e235fbe89d425c5c6203
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2022-05-12 07:39:35 +03:00
Assam Boudjelthia
10143120c1 Coin:Android: Enable tests for more modules - Part 3
This adds tests of more modules:
qtquick3d, qtremoteobjects, qtcoap, qtlottie, qtmultimedia,
qtnetworkauth, qtserialport, qtwebview.

Pick-to: 6.2 6.3
Task-number: QTBUG-88846
Fixes: QTBUG-100448
Fixes: QTBUG-100449
Change-Id: I0804b5be4bf17684a3d307e0a024304fa108af94
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-05-06 10:13:54 +00:00
Morten Johan Sørvig
b9a7cd83ee wasm: add thread-asyncify build variant
Add thread-asyncify build variant for the linux host. This configuration
will be used for running auto-tests, and may also be packaged for
distribution in the installer at a future point in time.

The config options are:
 thread:   -DFEATURE_thread=ON
 asyncify: -DQT_QMAKE_DEVICE_OPTIONS="QT_EMSCRIPTEN_ASYNCIFY=1"

Task-number: QTQAINFRA-4876
Change-Id: Id3ab3134ddd1cb47cf0ae9ac4cd3db239cdde01f
Reviewed-by: David Skoland <david.skoland@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-05-04 17:06:40 +00:00
Ievgenii Meshcheriakov
c3b063a6f2 Add qthttpserver module as preview
The module provides API for implementing a lightweight HTTP server
in Qt programs.

Task-number: QTBUG-100994
Change-Id: Ic382db6706c61581e70936f97b34eb318b95584a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
2022-05-04 10:34:29 +02:00
Pasi Petäjäjärvi
b42e533a6f CI: Make QNX 710 x86_64 significant
Pick-to: 6.2 6.3
Task-number: QTQAINFRA-4838
Change-Id: Ib75847afdf6ec4dea32f6b232f53768d2d5df2f9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-05-03 08:33:23 +03:00
Heikki Halmet
e5b819e26d Disable Software Updates for macOS
Pick-to: 6.3 6.2 5.15
Change-Id: Id80d66cfebaa17311d7bfd927f3ce33ba0b81661
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-05-03 08:33:22 +03:00
Piotr Srebrny
9196022e01 Make Copy-Item to throw exception if source does not exist
Copy-Item command does not throw by default. Thus, copying error is
not caught and the Download function returns without downloading from
the official site. Adding "-errorAction stop" makes Copy-Item to throw
an exception as expected in the script.

Change-Id: I889cccac775705613e641453aca9e0197645f344
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-04-29 13:06:03 +00:00
Alexandru Croitor
30068f2223 CMake: Normalize submodule names by stripping tqtc- prefixes
In tqtc repos, the dependencies.yaml files may point to tqtc- prefixed
repos, which can lead to build failures when doing a top-level build
and the local repo directory names have no tqtc- prefix.

This is the case both in the CI, and when using init-repository or
git submodule init --recursive, because qt5.git specifies the 'path'
key for each submodule to not contain any tqtc- prefix.

Normalize the repo names by removing the tqtc- prefix when doing
dependency resolution for CMake add_subdirectory calls, if such a
submodule name does not exist on-disk.
The normalization is conditional, to allow inclusion of repos that
don't have a non-tqtc mirror.

qt_internal_sync_to and the other git related operations
are currently broken (both before and after this change) when
used in conjunction with tqtc- repos and is non-trivial to fix.

The first problem is the assumption of using the 'origin' remote,
which will likely be an open-source repo that doesn't contain
any tqtc repos.

The second problem is that we would need to agree upon requiring
2 remotes, one open source and one tqtc one, to reliably choose
where to clone / fetch from, as well as determining whether
the checked out repo name needs to have a tqtc- prefix
(by checking whether the repo does not exist in the open source
remote for commercial only repos).

Alternatively we could hard code a list of known open source repos,
and anything not in the list will have its tqtc- prefix kept, but we
still need to know which remote to use.

As a drive-by, adjusted some of the shown messages for better
readability and easier grepping.

Pick-to: 6.2 6.3
Fixes: QTBUG-102883
Change-Id: I6806b119dd32b14dc0d9711dc829bfc5130d1e6f
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-04-28 19:27:59 +02:00
Simo Fält
052ef1bd9f Provisioning: Install python2 for arm mac also
We already use pyenv for installing pytho3 for arm macs, so it is
natural to use the same with python2. Also combining both provisioning
scripts as one, while python2 is already at the end of its lifespan and
should be removed completely from CI nodes.

Task-number: QTQAINFRA-4861
Change-Id: I0f2f73b974a83f8d3f0d42cb02d3b73e5ff82b17
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-04-27 11:38:20 +02:00
Jani Heikkinen
5bce721efe 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-26 20:45:32 +00:00
Qt Submodule Update Bot
06e00e9621 Update submodules on 'dev in qt/qt5'
Change-Id: Ie6d36c662750d2020b6f679abaf3bd46097aefa8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-26 20:45:30 +00:00
Volker Hilsheimer
314d2c5c27 Enable the qtspeech submodule as an add-on
Change-Id: Ie20dfb89f4e90913ae0d5f6230659d22c9fd08c0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-04-22 17:14:38 +02:00
Tatiana Borisova
2d7bba81c0 Update CI environment for INTEGRITY
- Add libplanedef, libmmosalfile, libOSAbstraction, libopenwfd, libpmem libraries into environment
- updated integrity_toolchain.cmake paths according existing CI folder structure

Pick-to: 6.3
Change-Id: Icda1a82f9d9afda38a3556f23d2f141ef2965c44
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-04-20 19:19:34 +03:00
Tatiana Borisova
4cb9ded166 Improve INTEGRITY cmake toolchain file
- Add possibility do not create megapack.a library
  manually for work with INTEGRITY framework.
- add 'frigor=accurate' option to control vectorization
  of floating-point calculations
- fix olink typo

Pick-to: 6.2 6.3
Change-Id: I67561e438d6f12ed62b6b41742970bdf38d0011c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-04-20 10:57:10 +03:00
Heikki Halmet
66725b2895 Update llvm-mingw package to official version
Pick-to: 6.3 6.2
Change-Id: I6083bd46871bc9f08e5b856aea5ed3b567cb5e53
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-04-19 09:53:03 +03:00
Heikki Halmet
789c276431 Update NDK to r23b
This also fixes Android OpenSSL installation

NDK update will be added only to dev and 6.3 branches

Task-number: QTQAINFRA-4837
Change-Id: I1233217e71f345d30f3dec83d7477d3c6e3b6c2d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-04-12 11:45:04 +00:00
Alexandru Croitor
2ee43055ed 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.

Pick-to: 6.2 6.3
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>
2022-04-11 17:27:49 +02:00
Heikki Halmet
12a87cba0a Provisioning: Install Android 11 automotive emulator
This is needed after moving from internal tqtc-qt5 branches to qt5.
Android 11 image was built internally.

Pick-to: 6.3 6.2
Task-number: QTQAINFRA-4343
Change-Id: Ie0c4c5853079303ef9d4537f3b7b06ab62f14e3b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-04-08 08:15:19 +00:00
Tor Arne Vestbø
3072446274 coin: Run macOS x86_64 developer build tests for all modules
Aligns the way we test x86_64 and arm64 developer builds.

Pick-to: 6.2 6.3
Change-Id: I87ea5e183b5ee29c62304b22eaf20c4b46ec3b0d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-04-07 08:02:47 +01:00
Qt Submodule Update Bot
4d4ad69ba1 Update submodules on 'dev in qt/qt5'
Change-Id: If38aa9c2fbfce2a2826b54517ba3ecc5a96cab74
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-06 20:57:19 +00:00
Alexandru Croitor
0cfa1fa561 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.

Pick-to: 6.2 6.3
Task-number: QTQAINFRA-4844
Task-number: COIN-823
Change-Id: I59b6a0ed6851a5fbed701c4f6ea050062bddb773
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-04-05 22:37:46 +02:00
Alexandru Croitor
75bab52bb9 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.

Pick-to: 6.2 6.3
Task-number: QTQAINFRA-4844
Change-Id: I2aa51175e3c393af079ab1d2b4648ced1fdf6a4a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-04-05 22:37:46 +02:00
Alexandru Croitor
5ab5cea6b3 Add CI platform configurations for the qmake2cmake repo
Adds Linux RHEL and macOS desktop platforms to run the qmake2cmake
tests and linters, as well one more configuration for the
license check.

Ubuntu doesn't quite work out of the box. Same for Windows.
They will be added later.

Change-Id: Id37d2ca6512ea8b7564dfa05b4bd6c49cadf96a5
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-04-05 22:37:46 +02:00
Simo Fält
bfc49c207d Provisioning: Update cmake to 3.21.3 to enable Android build
To avoid https://gitlab.kitware.com/cmake/cmake/-/issues/22634.

Pick-to: 6.2 6.3
Change-Id: I1227218514174843353b5bd5d831d89ed1ca89b4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-04-04 23:16:47 +03:00
Heikki Halmet
d6a7527384 Make Windows 11 21H2 significant
Pick-to: 6.3 6.2
Task-number: QTQAINFRA-4673
Change-Id: I7eebc889dbc9ecc7c741147a2703575b5bfeb04d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-04-04 14:54:51 +03:00
Eike Ziller
e2b2c06558 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.

Pick-to: 6.3 6.2
Change-Id: I8f752f6e2aff4bebd644a87a1f51255ca482d337
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-04-01 12:56:04 +02:00
Qt Submodule Update Bot
62be787f95 Update submodules on 'dev in qt/qt5'
Change-Id: I601d4f80cf324a98adb12f3ccf00702d60086ca6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-01 02:04:17 +00:00
Pasi Petäjäjärvi
45a92d5f26 CI: Add QtCoap network testservers for QNX QEMU
Pick-to: 6.2 6.3
Change-Id: Ibc18edaf4a1d9dec309396eb80744b6a21738382
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-31 14:42:44 +03:00
Heikki Halmet
f8311eaadf Provisioning: Install Chromedriver Chromium
This is needed by WebAssembly

Pick-to: 6.3 6.2
Change-Id: I3e828d643d2780308514b2939db5a1b4032c66ac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: David Skoland <david.skoland@qt.io>
2022-03-31 07:35:40 +03:00
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