Commit Graph

4576 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
a5c2a8655d Update submodules on 'dev' in qt/qt5
Change-Id: I76ef126ba99f51109bdcfe66316d5930355f8dce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-06 06:31:44 +03:00
Qt Submodule Update Bot
fd1a836a6a Update submodules on 'dev' in qt/qt5
Change-Id: I45ce4cb8046a62d3c62445430c9c091579f67cd5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-02 03:17:51 +03:00
Qt Submodule Update Bot
6dea0af932 Update submodules on 'dev' in qt/qt5
Change-Id: Ide971d150a18a0f4a5e417806a0193ed60e34cf8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 23:48:24 +03:00
Qt Submodule Update Bot
e50abbb346 Update submodules on 'dev' in qt/qt5
Change-Id: I8590d46c07f2239de0a2ee0c3392271c8e7ead01
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 19:52:54 +03:00
Qt Submodule Update Bot
1333aec43d Update submodules on 'dev' in qt/qt5
Change-Id: Icb1d3320be25f12fa914f1d338221c98079bc38a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 13:57:15 +03:00
Joerg Bornemann
cdc79cdfb9 provisioning: Make generated .emscripten look more natural
The WASM CMake port of Qt reads .emscripten and parses its content to
locate the emscripten root. We must bring our generated .emscripten
closer to what emsdk generates to prevent the parser from choking.

Change-Id: I5d17fb7679627ab3a7145f539f5a911fd227a6ac
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2021-04-01 09:05:20 +02:00
Qt Submodule Update Bot
3e2ba4d7bf Update submodules on 'dev' in qt/qt5
Change-Id: I3d86c1e7e616e54a3652a592e9a9a7f5a4b8fc99
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 07:17:04 +03:00
Qt Submodule Update Bot
19c21f1399 Update submodules on 'dev' in qt/qt5
Change-Id: I68e65f3507c0e5566e83a071c25ec816e5fa61e1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 02:35:17 +03:00
Qt Submodule Update Bot
1d02960ae1 Update submodules on 'dev' in qt/qt5
Change-Id: I443734e7439c4acf33e36cb8ac767ed56ccf2fa5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-31 20:18:07 +03:00
Qt Submodule Update Bot
278e0ce66e Update submodules on 'dev' in qt/qt5
Change-Id: Id4479eaf614d90dd13a6220dd3583a3e9f4246f7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-31 14:27:13 +03:00
Kai Köhne
1397f8c123 Fix ignored submodules if a submodule does not have a dependency.yaml
If a subdirectory has a CMakeLists.txt file, but no dependency.yaml file
qt_internal_add_module_dependencies will bail out early, with
out_module_dependencies being empty.

Pick-to: 6.1
Fixes: QTBUG-92257
Change-Id: I024e812e9debd3c83b24bf306ff0375b2cb08659
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-03-31 10:56:39 +02:00
Tor Arne Vestbø
c746f27e17 cmake: Allow specifying list of submodules using environment
The variable now has a QT prefix to make it less likely to
clash with other environment variables. For simplicity we
use the same variable name internally.

Change-Id: I4c8b1a43ae1facc2e33ae3cd21a8f6b43a437a9b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-30 13:19:56 +01:00
Alexandru Croitor
15e37e994d macOS: Don't specify OpenSSL path for macOS configurations
Currently the qtbase configure system always chooses to use
SecureTransport on macOS configurations, even if a usable OpenSSL is
found.
As it is, there's no point to pass the OpenSSL location as a
configure argument because one might get confused to think that Qt
will be built with OpenSSL support (it won't).

There is work in progress to allow building Qt Network with support
for multiple ssl backends, but until that work is finished, remove the
configure argument to avoid confusion.

Change-Id: Ib91f0b85edc580145a78ab38aba7718e90a95240
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-03-29 15:10:49 +01:00
Lorn Potter
46918ee092 wasm: fix linux node path
Change-Id: I445f5c44dfa4de4d1f0825c3218c7975780134b8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-29 08:02:42 +00:00
Johanna Äijälä
02d4c34b7d Provisioning: update Squish packges
Still using unreleased custom snapshot packages from Froglogic.
macOS: use custom build Qt5.15 package with separate Squish server
adjusted for Qt6.

Pick-to: 6.1
Pick-to: 6.0
Change-Id: I8605204118015feb347268c335ef731ff99e3c68
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-03-28 16:31:34 +02:00
Heikki Halmet
066964d275 Provisioning: Install GCC toolset for CentOS
GCC toolset provides upgraded GCC version for CentOS.

Pick-to: 6.0
Pick-to: 6.1
Change-Id: Ia62c7abf21eeed5d65c6b2e35fe1013d839cfa24
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-03-26 07:53:38 +02:00
Heikki Halmet
7a027b4dfd Provisioning: Upgrade Xcode to version 12.4 for macOS 10.15 and 11.0
Pick-to: 6.0
Pick-to: 6.1
Task-number: QTQAINFRA-4230
Change-Id: Id3de8771e18da5d40cf62ad501a23fce89e845c4
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-03-26 05:53:25 +00:00
Paul Wicking
ed139ea47e Update documentation for init-repository
There's no mention of additionalLibrary status.

Pick-to: 6.1 6.0
Change-Id: I3ebf8fdc6dcfc01392b1ab5a42734cef81d6fc61
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2021-03-25 15:39:05 +01:00
Qt Submodule Update Bot
03c61efaed Update submodules on 'dev' in qt/qt5
Change-Id: I924b1429f816e1505a09183e736d32ad797465aa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-24 09:09:46 +02:00
Qt Submodule Update Bot
d38d0ea0cf Update submodules on 'dev' in qt/qt5
Change-Id: I480f185647ff5944110b5fcd39ee8e96565198a2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-24 04:53:35 +02:00
Heikki Halmet
152a80ec1d Provisioning: Remove libclang from Windows 10 x86
Libclang static is not needed by Qt Creator. Also x86 package is not
available in download.qt.io or in cache.
Qt Creator is the only one using Windows 10 x86 at the moment.

Pick-to: 6.1
Change-Id: I983db655c497105c3154ab64b170a8ed8739a59c
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2021-03-23 08:39:19 +02:00
Heikki Halmet
fb65f86083 Add Packaging target for openSUSE 15.2
With current approach we need to make two different linux installers.
One for SUSE and one for other linux targets we support. This is because
current CentOS version have newer GLIBC version than what we have in SUSE.
This means that installer made with CentOS won't work in SUSE versions
we support

Task-number: QTBUG-91873
Change-Id: If65d66093bf8dcb5fe46812e06d6b9194fdedac2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-03-22 06:13:12 +00:00
Qt Submodule Update Bot
64a559a848 Update submodules on 'dev' in qt/qt5
Change-Id: I43fb1c9928f0a08594e8e1a231f32f470bffc8f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-19 06:46:54 +02:00
Tor Arne Vestbø
eaed67d307 configure: Let shell deal with errexit and xtrace
Change-Id: I9ae6d6003885607d2300d4d84e8629d7891420db
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-03-18 12:45:24 +01:00
Qt Submodule Update Bot
c1f24b99db Update submodules on 'dev' in qt/qt5
Change-Id: Ic94b0d9938311e6390bbc9c16deb3c66285a4f84
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-18 08:50:48 +02:00
Toni Saario
823b0234c7 Fix emscripten windows sha1
The target has changed on the remote. This time it will be cached
on the ci-files01.

Change-Id: Ibff640f889aa55f322c11bcf6a4a4893fb41b234
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-03-17 12:33:38 +02:00
Qt Submodule Update Bot
3b35cf20bd Update submodules on 'dev' in qt/qt5
Change-Id: I8dab99b0d2a21d0029bca9cf1b38c85315bf7540
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-16 17:28:15 +02:00
Tor Arne Vestbø
4b194617a2 Remove qt.pro
Qt does no longer support being built with qmake.

Change-Id: I01598605b491e3c477553c6cc60118a9639b6dd0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-03-16 11:15:08 +01:00
Qt Submodule Update Bot
644d718f92 Update submodules on 'dev' in qt/qt5
Change-Id: Ica26fc80bed66baaa566e8e294aaa517413527cc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-15 08:45:39 +02:00
Laszlo Agocs
7ac5d86de5 Add qtshadertools as recommends dep to qtdeclarative
Change-Id: Ic0d11b3b1312a8d82f6c3421af51bdea2a692b40
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2021-03-12 17:40:11 +01:00
Joerg Bornemann
a949aa5591 Remove unused TopologicalSort.cmake
Commit da25b7f149 removed the usage of
TopologicalSort.cmake. Remove that file and its associated attribution
data and license.

Change-Id: I2dd34764c4343ac9ae0ce6fdcff5adcc3b70d299
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-12 16:03:17 +01:00
Joerg Bornemann
81096b44bb Do not error out on missing optional repository dependencies
Read the 'required' value from dependencies.yaml and store all required
dependencies of repository 'qtfoo' in a global property
QT_REQUIRED_DEPS_FOR_qtfoo.

Check this property in the top-level CMakeLists.txt and only print
informational messages instead of errors for optional dependencies.

Fixes: QTBUG-91144
Change-Id: I0e1b84a70221857cebba1b9a27456ad3667bfe3a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-12 16:03:03 +01:00
Dominik Holland
174a511460 Enable all cmake targets for qtivi
Task-number: AUTOSUITE-1633
Change-Id: Iffbaaa1e5141f92d85b1daa80f3dbbdd0bc83bac
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-03-10 14:14:59 +01:00
Qt Submodule Update Bot
1938e370e9 Update submodules on 'dev' in qt/qt5
Change-Id: I661da92ce4c05377134c5dbd46ac479487e88fd0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-10 09:35:44 +02:00
Karsten Heimrich
baaca594ca Add QtSerialBus as additional library
This patch adds QtSerialBus to be updated by submodule udpate bot.

Change-Id: I9b51118d21ee4309315d36cab5bf9721b34067f7
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-03-09 09:16:10 +01:00
Ivan Solovev
66e8759c66 Add QtLocation to addon modules
This patch adds QtLocation to be updated by submodule update bot.
Also removes unused dependencies.

Task-number: QTBUG-90864
Change-Id: Ia54234ad26907129932d76be11a3402cd8bddec9
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-03-05 18:16:04 +01:00
Qt Submodule Update Bot
688615aa59 Update submodules on 'dev' in qt/qt5
Change-Id: I46198fa3f3a6a133ab9a08720b229446b3696cee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-05 12:09:19 +02:00
Qt Submodule Update Bot
009a4a7d21 Update submodules on 'dev' in qt/qt5
Change-Id: If401533ab8648b6dcdf245677ec1968e8d1d6a3d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-05 07:35:18 +02:00
Ivan Solovev
c8981696df Add QtSerialPort as addon module
This patch adds QtSerialPort to be updated by submodule udpate bot

Task-number: QTBUG-90864
Change-Id: Ic029157a7b6e88f8c8899f9f5b075943d2767810
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
2021-03-04 09:46:01 +01:00
Heikki Halmet
8843f51866 Change GCC version to 8.3.0 for Ubuntu 18.04
We need to use gcc 8 instead of 9 so that the Qt installer
will work with CentOS 8.3 which have gcc 8 in the system.
If we use newer gcc version with the binaries there will be issues
with libstdc++.
Using gcc-toolset-9 in CentOS won't help either because it will link
libstdc++ against the one in system.

Pick-to: 6.1
Task-number: QTBUG-91352
Change-Id: I2a3d186bc04b1f54f14ed95f0588d18bd63814c4
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2021-03-03 07:51:46 +02:00
Qt Submodule Update Bot
91dc70dba9 Update submodules on 'dev' in qt/qt5
Change-Id: Ib9683d8e6e1530d1df10704cd2c8663934532371
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-02 08:04:02 +02:00
Heikki Halmet
7d2e13da10 Provisioning: Remove squish script call under Windows 10 x86
RTA don't use squish with Windows 10 x86 in Qt6

Change-Id: Ib1c27e53310506f2c91ab8b65404caba8fcfcaf8
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 26bffd2fab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-02-25 14:33:48 +00:00
Topi Reinio
8ebf0095c3 init-repository: Fix incorrect use of 'or' operator
This fixes the warning 'Useless use of a constant ("qt5") in void
context at ./init-repository line 649.'

Pick-to: 6.1 6.0 5.15
Change-Id: I12133b30b504e536eaf68e4260df5aed28543eb6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2021-02-25 15:14:58 +01:00
Heikki Halmet
0a6511c1e7 Change configuration arguments for Ubuntu 18.04 to match CentOS target
We shouldn't change configuration parameters when whiching to use
Ubuntu 18.04 instead of CentOS 8.3

Pick-to: 6.1
Change-Id: Icfce35acec8baa4488089e555c311a063455c24b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-02-25 08:41:24 +02:00
Qt Submodule Update Bot
ef50922df5 Update submodules on 'dev' in qt/qt5
Change-Id: Ideaffabe09bb7b9fe57db79c4090f8d1deac928e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-24 05:20:07 +02:00
Lorn Potter
7c26fecfaf Provisioning: Bump Emscripten version to 2.0.14
Change-Id: I6345cdc3ffef7f17fa75406a3816d1b59451a05a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2021-02-24 09:10:08 +10:00
Qt Submodule Update Bot
b5f60885e5 Update submodules on 'dev' in qt/qt5
Change-Id: Icda990c681e1ba746c0d29a8904aa36893650e11
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-23 03:27:57 +02:00
Samuli Piippo
b6c8b8f470 Make QEMU builds significant
All tests pass, remove InsignificantTests from QEMU builds.

Task-number: QTBUG-86238
Pick-to: 6.1
Change-Id: Ia3d2b9ef3ce06cbdf67c99bcbe64f36f7bbdb1ec
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-22 10:09:49 +02:00
Heikki Halmet
c8a55fece5 New images with accessibility for squish for macOS 10.15 and 11.0
Pick-to: 6.1
Task-number: QTQAINFRA-3559
Change-Id: I9a9d4c4f01f883c83adbd097d8045012e198c4fe
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-02-22 07:20:02 +00:00
Qt Submodule Update Bot
63714587d1 Update submodules on 'dev' in qt/qt5
Change-Id: Ia53290df5328114f63a041d99d37b2cb52e8eb12
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-20 08:37:26 +02:00