Commit Graph

4670 Commits

Author SHA1 Message Date
Michal Klocek
f0ec54c6fb Switch qtwebengine to cmake
Add defaults for now. Later this should get customized
to avoid unnecessary targets.

Task-number: QTBUG-91760
Change-Id: I72d3f11e117abeecf6c8c5fefac16fe951d3a9da
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-22 14:36:00 +02:00
Qt Submodule Update Bot
3be01a1c13 Update submodules on 'dev' in qt/qt5
Change-Id: I6b3c078d08b56578cdd8b0e0ddc4a8f68f6d7516
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-20 19:29:39 +03:00
Dan Ackers
2cee9da977 Libusb coin provisioning
Include libusb to linux, macos and windows

Pick-to: 6.1
Task-number: QTBUG-90951
Change-Id: I633e731d84cc60064bc2d1942f6a1ce129240711
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-05-20 10:57:03 +03:00
Qt Submodule Update Bot
5892947306 Update submodules on 'dev' in qt/qt5
Change-Id: I041374600ca52e2f024d94c465bd6798fa8242e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-20 07:36:35 +03:00
Alexandru Croitor
b2fc30956b wasm: Enable sccache for wasm configurations
Change-Id: I564348482511b472940d6c75623d90809a6693a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-05-19 19:14:18 +02:00
Joerg Bornemann
43f3795125 wasm: Add WebAssembly platform to Coin
Change-Id: Ia377ad7ff8a675e80ead78eaf47848cc0f235247
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-19 19:14:15 +02:00
Qt Submodule Update Bot
a79dc991e0 Update submodules on 'dev' in qt/qt5
Change-Id: Ia3383cfb2dfd5258ce59db5b064a92ba321a7c8e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-19 18:08:01 +03:00
Jani Heikkinen
66ce587c46 Restore qtwebchannel as a addon in qt5.git
According to plan Qt Webchannel will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93212
Change-Id: Iea137a18d8c635210ee56e2ebfa1f485b4a791a8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-18 17:18:41 +03:00
Tor Arne Vestbø
2cca3aa049 Add qt5 macOS ARM packaging insignificant tests
Change-Id: I62847257a0e8dcb3e48714cb1140a09bebcb53c2
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-18 13:48:22 +02:00
Tor Arne Vestbø
16a03d48a6 coin: Make macOS on ARM packaging tests significant for a few modules
Not all modules pass yet, but we want to at least make the ones that
do blocking.

Change-Id: Ic3270bab8825c79d3315e6241d62af1bf7f62435
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-05-18 12:37:32 +02:00
Allan Sandfeld Jensen
c4fb89196c Add qtwebchannel config
Change-Id: Ida06681db4cceac72c7cc5b8dcad34457399d756
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-18 10:27:00 +02:00
Jani Heikkinen
82f2b64659 Restore qtwebsockets as a addon in qt5.git
According to plan Qt Web Sockets will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93684
Change-Id: Idbbc0e5c553bcd863f4b8ad21b9aee6057fe139e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-18 10:13:38 +03:00
Jani Heikkinen
6056d3be5f Change 'Target arch' for macOS universal build
This build containing both x86_64 and arm64 architectures. The 'Target
arch' ends up in the binary package names and needs to be changed
because '+' is illegal character in Amazon S3 file names so replace the
'+' with '-' in the 'Target arch' section.

Fixes: QTBUG-93778
Change-Id: I325210d51115ae0b1eda056636b69421f68fabd8
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-18 05:06:47 +00:00
Heikki Halmet
ca1894acaa Remove CentOS 8.3 targets
Provisioning scripts will be removed later

Task-number: QTQAINFRA-4415
Change-Id: I71da9743066a81638518f44dc663324246a2ce8c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-05-17 20:40:58 +03:00
Qt Submodule Update Bot
ba2c43b731 Update submodules on 'dev' in qt/qt5
Change-Id: Ib3de299c8f75105e8df3e6d78c58ecb05649ad0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-12 10:36:24 +03:00
Heikki Halmet
99a81d0c6c Provisioning: Temporary fix for installing Conan packages in Windows
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4443
Change-Id: Iba4b240edaf4a3ec8732ddbe1ae4ac5c1166b676
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-05-12 09:17:40 +03:00
Tor Arne Vestbø
d85ff1e934 Remove qtmacextras and qtx11extras submodules
They are no longer part of Qt (as of Qt 6), and the modules themselves
have been wiped (9d99db029613d9cd847407085c5de7f310cd0937, and
6037ece5e4c0d290ae4ebf75c0d9bce0de55ed85).

Task-number: QTBUG-83251
Change-Id: Ie3acfc6d31bda0fcc1c6189e08171dbdf3c50ff7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2021-05-11 10:04:16 +02:00
Jani Heikkinen
da632b95d2 Restore qtremoteobjects as a addon in qt5.git
According to plan Qt Remote Objects will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93139
Change-Id: Ia4c9feae94b69f01a3c36872b346aa872f0e6654
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
2021-05-07 10:33:55 +03:00
Jani Heikkinen
3916c0bbac Switch qtconnectivity from additional library to addon
And at same time bump qtconnectivity sha1 in qt5.git

Change-Id: I1a9cfdbc95157715bf7b76870d918add76009e4e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-05-06 13:50:28 +03:00
Qt Submodule Update Bot
7a79c16814 Update submodules on 'dev' in qt/qt5
Change-Id: Ie7555c2f5c1eacde17e2bee06a496c723025e34e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 20:52:42 +03:00
Simo Fält
2a4635379c Add ci config for Windows 10 on Arm
Task-number: QTBUG-85820
Change-Id: I145cbfbd39fe164bc57d4106e58c50add51fe976
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-05-05 20:52:42 +03:00
Tor Arne Vestbø
e1c8cf2d39 Add test configuration of macOS universal builds on ARM
Change-Id: I8dec178343978b36dce3e9d262a7f6f234513892
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-05 11:45:50 +02:00
Qt Submodule Update Bot
80b5b60a5a Update submodules on 'dev' in qt/qt5
Change-Id: Ibb59bafe553eb0ca055d8d4275f476d87b4c46c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 10:06:13 +03:00
Qt Submodule Update Bot
f32e311b13 Update submodules on 'dev' in qt/qt5
Change-Id: I0cc9ad6d4dae1049b5d5ccba84afa4ea1ff7dbc2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 02:16:11 +03:00
Qt Submodule Update Bot
c94ae9ad53 Update submodules on 'dev' in qt/qt5
Change-Id: I32545ca7ab23266ecbf9ce26593a40bbac9a87cc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-04 11:29:13 +03:00
Qt Submodule Update Bot
1b00e13ec8 Update submodules on 'dev' in qt/qt5
Change-Id: I76b03c8a5e6fdd3da47e35de6ea37b5f7579970a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-04 03:59:53 +03:00
Qt Submodule Update Bot
97f41c2fef Update submodules on 'dev' in qt/qt5
Change-Id: I2d83b0da164cfea2694b51f32069698d0c6780af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-03 19:38:04 +03:00
Qt Submodule Update Bot
2fc400fed7 Update submodules on 'dev' in qt/qt5
Change-Id: Ifb8d58ff4677c73e5b2a0ac381a99f9bc4351dff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-01 15:21:46 +03:00
Qt Submodule Update Bot
453cf99c90 Update submodules on 'dev' in qt/qt5
Change-Id: I727a0d4b9c1cc665acf9aaf5c03d168f63646398
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-01 10:02:16 +03:00
Qt Submodule Update Bot
d38a5d0044 Update submodules on 'dev' in qt/qt5
Change-Id: I8774af63fd1e96cd2e95288170a4510c3799f3ba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-30 20:24:36 +03:00
Cristian Adam
c653958301 Update QDoc libclang to 12.0
Task-number: QTBUG-93203
Change-Id: I58b9af361b8e02b7210286ff3cfd6ca07ebb9610
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-30 14:37:00 +02:00
Heikki Halmet
6ae5052d57 Provisioning: Upgrade python 3.6 version to 3.6.2
typing.NoReturn is not included in python 3.6.1 version. We need at
least 3.6.2 version

Pick-to: 6.1
Pick-to: 6.0
Task-number: QTQAINFRA-4433
Change-Id: I040e72e253852c7789d4f9e781d18e6b9a431a50
Reviewed-by: Dan Ackers <dan.ackers@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-28 12:47:10 +03:00
Qt Submodule Update Bot
81bb861060 Update submodules on 'dev' in qt/qt5
Change-Id: Ia193a750ec32f83192170066c2da078f31d583c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-28 08:43:14 +03:00
Alexandru Croitor
b3a0469100 CMake: Re-add Linux static config to keep build coverage
We want at least one config that ensures static host Qt builds
work in the CI, even if no tests are built.

Amends bead5e8720

Task-number: QTBUG-87580
Change-Id: I091e85ca40faef30ddad57e2a392d65197a47027
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-27 20:09:30 +02:00
Alexandru Croitor
bead5e8720 Build minimal subset of tests in desktop static builds
New cmake_platforms_static_tests.yaml file will be included in repos
that support building and running a minimal subset of tests built
against a static Qt.

Currently it's limited to qtbase.

Moved existing 'linux-SLES static' config into this new file and
also added a macOS and Windows config.

Skipped specifying the PostgreSQL lib path for Windows and macOS because
the plugin gets automatically linked into tst_moc, but the test build
phase doesn't actually call find_package for PostgreSQL and the build
system generation fails.

Similary skipped specifying the openssl lib location for macOS,
because the module_includes cmake auto test fails to find the
WrapOpenSSLHeaders package.

Explicitly tag iOS static config with DisableTests. The instructions
already skipped building tests for iOS, but it's better to be explicit
and update the instructions not to do that anymore.

Pick-to: 6.1
Task-number: QTBUG-87580
Change-Id: I0d38a0ad055c92646609202691aeb8db29689f5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-27 15:18:22 +02:00
Heikki Halmet
9e0334389b Provisioning: Fix nodejs installation
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTBUG-93178
Change-Id: I27f4b1aa6f382cb6c9cc97f960fe1d0b81e47fbd
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-27 12:36:38 +03:00
Qt Submodule Update Bot
efe7e1f958 Update submodules on 'dev' in qt/qt5
Change-Id: Iabc6447679ee0bd1729c36457c6e5b585be9fcf4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-27 10:56:59 +03:00
Qt Submodule Update Bot
1da070930a Update submodules on 'dev' in qt/qt5
Change-Id: I99095f78c24e7e33390357962b60674139186403
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-27 05:06:11 +03:00
Qt Submodule Update Bot
e8dbbafd1d Update submodules on 'dev' in qt/qt5
Change-Id: I69ea8bbff2881cdcb0cb4776c8dfec950773c46d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-26 23:08:57 +03:00
Qt Submodule Update Bot
2b371b2920 Update submodules on 'dev' in qt/qt5
Change-Id: I6cd6e5bed9d386758d69877a090b272b1e27f007
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-26 15:56:01 +03:00
Heikki Halmet
0e9f489192 Provisioning: Upgrade OpenSSL version to 1.1.1k
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Change-Id: I539d6da1953a40190fbfc8ff80f8e8332d797b1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-04-26 12:56:01 +00:00
Heikki Halmet
2d47450e69 Provisioning: Fix gcc toolset source path
Pick-to: 6.1
Pick-to: 6.0
Change-Id: I4e81894648c25ce629914bc4bd9ffa65681ad004
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-26 13:10:14 +03:00
Qt Submodule Update Bot
d142a10dd5 Update submodules on 'dev' in qt/qt5
Change-Id: I2765de991ac8c2fed865506d44a3ca9eea2188b7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-24 12:03:39 +03:00
Qt Submodule Update Bot
c9cc27815c Update submodules on 'dev' in qt/qt5
Change-Id: I02823722e7c8c24a682e8c8a63520ff0f69a64a2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-24 05:44:38 +03:00
Qt Submodule Update Bot
dcdc29133d Update submodules on 'dev' in qt/qt5
Change-Id: Ib358c3ed83afff5162f39f76a689e348bbb6d821
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-23 19:29:48 +03:00
Heikki Halmet
1ebec86732 Remove packaging flag from CentOS targets
This will also remove CentOS target under QtCreator
and RHEL's Insignificant flags from submodules

Task-number: QTQAINFRA-4416
Change-Id: I2e6d910dfbba7a7903b149f5cf0bc3386cd4e3e2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-23 14:32:45 +03:00
Toni Saario
0d3d17d388 Add target arch for universal macOS target
This makes the field to reflect reality as otherwise it will be
resolved from the template and excludes the arm64.

Change-Id: I39972e47ba2a0ab9fe4322c844b60383187a762b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-04-23 06:02:47 +00:00
Jani Heikkinen
5f38d6aa61 Update additional library sha1's to qt5.git
Change-Id: I92078b3664cee04c3ad9e96d02072933a21b904c
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2021-04-22 11:39:14 +03:00
Jani Heikkinen
e574441847 Drop unnecessary qttools dependency from m2m protocols
Change-Id: I5b8a169e4c96e76bc34806a8befdc83784106413
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2021-04-22 11:39:14 +03:00
Jani Heikkinen
a8a17646ab Change all (except qtconnectivity) additional libraries to addons
It has been decided to *not* ship source-only Conan packages in Qt 6.1,
but revert back to delivering the additional libraries similarly as with
Qt 5.

That's why we need to switch all additional libraries to addon to start
building binaries for those as well in qt5.git integration.

qtconnectivity will be changed when QTBUG-92990 is fixed.

Task-number: QTBUG-91796
Change-Id: Ia154b62d5c1a997575d844aaf21f399a24626748
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
(cherry picked from commit 55874781a1)
2021-04-22 11:39:14 +03:00