Commit Graph

4795 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
564fddd1aa Update submodules on '6.2' in qt/qt5
Change-Id: Icdc8dd2095e2e0a5636f8c89181d39e0936e0c7f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-04 20:57:41 +03:00
Qt Submodule Update Bot
8df89f1f84 Update submodules on '6.2' in qt/qt5
Change-Id: Id05b4bef885c7115694077c9db0bf6ee9cd7d761
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-02 06:55:56 +03:00
Qt Submodule Update Bot
e5f7eb075f Update submodules on '6.2' in qt/qt5
Change-Id: Ia0d34014d08a282844b5c46aaa75fb62d71ff0c1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-01 20:49:39 +03:00
Qt Submodule Update Bot
cf4464c133 Update submodules on '6.2' in qt/qt5
Change-Id: Ib70902bbd55a4a4d1c28d5e147c3d088d931381d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-01 08:50:26 +03:00
Qt Submodule Update Bot
887d4032fa Update submodules on '6.2' in qt/qt5
Change-Id: I62741b04194baab1baf0162995fc74c5cd777220
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-30 14:12:08 +03:00
Dan Ackers
7b9448f2b9 Rename new file for clarity
Change-Id: I83428ef280cef73c3c0530feabb116973632ccd9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 96269c2d01)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-29 13:05:02 +00:00
Qt Submodule Update Bot
403f9d56e7 Update submodules on '6.2' in qt/qt5
Change-Id: I49239b6f4b59f19513a91a52208a25c73806f9c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-29 09:57:13 +03:00
Dan Ackers
8504d78c96 Make QNX-toolchain files git-tracked
Also, qnx now builds only using toolchain
packages, ignoring host mahcine.

Task-number: QTQAINFRA-4502
Change-Id: Ifd2f3cf1260b92cee8040e1d2213809bad1b3fc1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 80d0b2a91b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-28 22:32:01 +00:00
Dan Ackers
04f7a70291 Integrity: git track toolchain file
Also make cmake find libraries only from toolchain

Task-number: QTQAINFRA-4580
Change-Id: I5eabaa3b6915e16db6ce152591d3b88bc7483d29
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit cae9a1e8ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-28 22:32:01 +00:00
Qt Submodule Update Bot
5f06a16be9 Update submodules on '6.2' in qt/qt5
Change-Id: I1cc372fc1771c6720dab93b9fe3be646c6de8555
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-28 20:09:26 +03:00
Qt Submodule Update Bot
f5c6dde718 Update submodules on '6.2' in qt/qt5
Change-Id: I351a637e8d09c01b6bb7155d518603431a7b6fd2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-28 08:48:40 +03:00
Alexandru Croitor
53779c4fa1 wasm: Don't include debug info in Qt for WebAssembly packages
This substantially decreases the package sizes. It's also what we
currently do for Qt 5.15.x WebAssembly builds.

See also f44dfe9c34 which did not enable
debug information for iOS builds because there's no implementation for
separating the debug info from static libraries yes.

Task-number: QTBUG-96793
Change-Id: I743946c9e1367e88c7dd6dafec57648d9dbf2e9c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 551c838bad)
2021-09-27 11:56:56 +02:00
Qt Submodule Update Bot
c2a8760db7 Update submodules on '6.2' in qt/qt5
Change-Id: I69b166a88acd1773d8e74ad192a8974044052e10
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-25 10:47:18 +03:00
Qt Submodule Update Bot
77e75866a2 Update submodules on '6.2' in qt/qt5
Change-Id: Ibbf01a3d74121d12dc806adecdf045e3c8c0b6e4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-24 23:03:14 +03:00
Qt Submodule Update Bot
a193212edd Update submodules on '6.2' in qt/qt5
Change-Id: I0ddd5d9e9ead853ff437799c3e1d41bfdd9955eb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-21 04:26:39 +03:00
Qt Submodule Update Bot
21092f1a60 Update submodules on '6.2' in qt/qt5
Change-Id: Ia68b201a8f1ed988995574f4ff18dd946cac70f8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-20 17:01:55 +03:00
Qt Submodule Update Bot
33b1a3a319 Update submodules on '6.2' in qt/qt5
Change-Id: I41240201c1c2c55df8ad429eb3d926a16bb730bf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-20 07:16:32 +03:00
Qt Submodule Update Bot
8f77aad620 Update submodules on '6.2' in qt/qt5
Change-Id: I84d860988a29673b3e6acdb2c97a06d4f175d9f6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-15 12:29:27 +03:00
Qt Submodule Update Bot
606219e8ae Update submodules on '6.2' in qt/qt5
Change-Id: Ic29a3336f09138631bbdd3204fd62aa45677242d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-15 03:10:28 +03:00
Qt Submodule Update Bot
ce0a3d708c Update submodules on '6.2' in qt/qt5
Change-Id: I0f9ae16e27e01b35036ed1ce079cb49cb7fa9c4f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-14 14:55:17 +03:00
Qt Submodule Update Bot
bb898b6cc0 Update submodules on '6.2' in qt/qt5
Change-Id: I0331b379dd023e74dc59a6e40e9aae43cff75f85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-09 20:49:02 +03:00
Qt Submodule Update Bot
21e86307ed Update submodules on '6.2' in qt/qt5
Change-Id: I7e124fb9c53ed512f6f581170a256ca20dccef17
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-09 04:42:19 +03:00
Heikki Halmet
e5679646b5 Provisioning: Update the Integrity toolchain version
Task-number: QTQAINFRA-3555
Change-Id: I2a1f25024862b0b96bb7675376520d2e3a679d0b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit f320433979)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-08 05:28:19 +00:00
Qt Submodule Update Bot
833372c809 Update submodules on '6.2' in qt/qt5
Change-Id: I986062980c44c646e92924d94dc8092a1cd65726
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-07 19:25:16 +03:00
Jani Heikkinen
2fd650b973 Add '-DFEATURE_gds=OFF' as a non-qtbase configure argument for macOS packaging host
We need to disable GDS feature to solve OpenSSL library linking issue

Fixes: QTBUG-93759
Pick-to: dev
Change-Id: I3625c06b14c633d77f1628ae0cda3092284eabd6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-09-07 16:58:57 +03:00
Heikki Halmet
b94cc9cc28 Make Integrity significant
Task-number: QTQAINFRA-4285
Change-Id: I131e6af26a28012228178192e60e2a91d33959fe
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-09-07 08:01:09 +03:00
Simo Fält
2fe9652422 COIN: Fix integrity target configure arguments
Change-Id: I624feea29eb70dadb9e959d6056eaccd73b7169a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9385d5d687)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-06 05:45:10 +00:00
Qt Submodule Update Bot
963b169394 Update submodules on '6.2' in qt/qt5
Change-Id: I9b6f54949bcafcf8026e51e799d2492dc3f4a317
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-04 00:05:41 +03:00
Kimmo Ollila
da33061d66 Add Integrity target for other modules
QtDeclarative, QtImageFormats and QtShaderTools

Change-Id: I24906d833d364a80025663928650f032a8618c22
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit dd24bc25c9)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-03 09:48:22 +03:00
Kimmo Ollila
1d7d4a7603 Add Integrity target for QtSvg
Change-Id: Ic677c932151aeed9f72e49baba9038bf122e5b5b
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 401ef8a8b3)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-03 06:48:19 +00:00
Heikki Halmet
9fd1d19465 Add Insignificant flag for Integrity
We will add new module targets for Integrity. Those are not tested
during Qt5 integration. Let's remove the flag after we are sure that
nothing will break on those new targets

Change-Id: Ifdcecc869a931897e377281618dfce744353b47e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-03 09:48:13 +03:00
Simo Fält
433f106d31 Make Integrity platform config as a cross compile target
While there was no target os value, COIN thinks that it is a normal
desktop target. This causes the host and target artifacts being copied
to wrong location.

Change-Id: Ie478f66e424859fbbf51d3f2d9d7efba032b30c5
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b5c4effe7e)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-03 09:48:09 +03:00
Qt Submodule Update Bot
4de7f2fd54 Update submodules on '6.2' in qt/qt5
Change-Id: Ibc0860c74a72a87dd3a6215649bc5cd756e4eaad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-03 07:37:54 +03:00
Qt Submodule Update Bot
3a4502ae3d Update submodules on '6.2' in qt/qt5
Change-Id: Icb82129f238d41a99cc59c6b53d0aab37a04f0d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.2.0-beta4
2021-09-02 12:40:52 +03:00
Robert Griebl
33988e12ac Add a platform config file for Qt Application Manager
Change-Id: I59013a841e96eb679798e906af4c1af09884dc45
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 2b22f80725)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-09-02 09:19:01 +02:00
Alexandru Croitor
51155b7bf8 Build minimal subset of tests in qtdeclarative desktop static builds
Task-number: QTBUG-87580
Change-Id: I417dbfc9b9b3092c9c14227907db4f1c16124ef1
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit f0c7664195)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-08-27 14:42:00 +02:00
Alexandru Croitor
26e43959e1 iOS: Build a subset of tests when targeting iOS
Currently will only build tests/auto/cmake projects in qtbase.
More work is needed for the other repos.

Task-number: QTBUG-95839
Change-Id: Ie1aa6deb202c9b84ce0c14b0f851f38a3a71fe7b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 4fea3be3af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-27 08:09:25 +00:00
Assam Boudjelthia
8ab13223a5 Coin: bump Android build tools and platform sdk level from 29 to 30
Google requires target SDK level 30 for apps that can be accepted to
the Play Store. This change goes together with bumping the default
target sdk in qtbase (from 29 to 30 as well).

Ideally, build tools should be kept up to date as well anyway.

Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit 6ac98447b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-26 18:17:13 +00:00
Heikki Halmet
86a34fb5d7 Upgrade Xcode and Command line tools to the latest version for Big Sur
Latest version is 12.5.1

Change-Id: I86111d5fdab6e06201f1184bbd23806d25eed192
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit f824365cb5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-24 07:14:39 +00:00
Samuli Piippo
5f7bb79fd9 qdp: remove system dependencies
Use more of the same arguments as RHEL-8.2-host to limit
the unnecessary dependencies to the system libraries.

Task-number: QTBUG-95882
Change-Id: Ibc5b1755aca7bfef42fd7ca3db0d19ebd49b8e4e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-08-23 13:51:44 +03:00
Qt Submodule Update Bot
69197946f0 Update submodules on '6.2' in qt/qt5
Change-Id: I729fb6acd74ad1d366a12c6919868654d8df7218
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-20 06:26:23 +03:00
Eike Ziller
3c2fca6bb1 COIN: Re-add qtsdk.yaml
That is used by our Jenkins setup for packaging.
To keep things simple, just include the cmake_platforms and
Qt Creator's config.

Change-Id: I13425f08c2f51a1522da25804fc7883f8d817059
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
(cherry picked from commit bbd31689ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-19 12:29:12 +00:00
Qt Submodule Update Bot
bed102a587 Update submodules on '6.2' in qt/qt5
Change-Id: I85d2b2185329ec189baac4a7b5c93bdb63484c43
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-19 09:33:14 +03:00
Allan Sandfeld Jensen
1f452fd479 Update node.js to 12
For Ubuntu it means using an alternative packages, for
openSUSE not using an alternative package.

Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c4b8c908b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-18 19:19:46 +00:00
Eike Ziller
aaf0fad6b5 Provisioning: Install 32bit version of Ninja on Windows
So it also runs on 32bit Windows. Ninja upstream switched their
binary builds to 64bit with Ninja 1.7, so we need to provide our own.

Amends e8b0be7711

Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f945fdc735)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-17 15:59:58 +00:00
Qt Submodule Update Bot
04ad2b6523 Update submodules on '6.2' in qt/qt5
Change-Id: I89c18397efc86bdf62a11c439a99627b03033b32
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-17 17:34:49 +03:00
Qt Submodule Update Bot
2ef340e02d Update submodules on '6.2' in qt/qt5
Change-Id: Iae77e867f60ba639acde4187708786611d5b5a4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-17 07:59:27 +03:00
Joerg Bornemann
384bff22f7 Remove qtgraphicaleffects from .gitmodules
This repository has been merged into qt5compat.

Change the 'recommends' field of qtquickcontrols2 from
qtgraphicaleffects to qt5compat.

Fixes: QTBUG-95228
Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit cec25d2ac6)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-08-16 12:47:23 +02:00
Mitch Curtis
76741ceaa5 Remove qtquickcontrols2.yaml from platform_configs
Task-number: QTBUG-95173
Change-Id: If7470b3d5cd5721def97fd5b41e46e037cec2286
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9b3411da8d)
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
v6.2.0-beta3
2021-08-14 11:59:02 +02:00
Alexandru Croitor
92b188ef62 CMake: Update provisioned CMake to version 3.21.1
Task-number: QTBUG-95018
Task-number: QTBUG-95229
Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 9218d50a6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-14 09:58:51 +00:00