Commit Graph

4593 Commits

Author SHA1 Message Date
Matti Paaso
2140c07299 Fix qt-creator license check
Pick-to: 6.1
Change-Id: I7c9df1313075294ddfbfa8ceb14be267eacc3d2b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-12 07:21:29 +00:00
Toni Saario
32579bc3c4 Add conan to path
Pick-to: 6.1
Change-Id: I90e028409f606a703fd9b567a221f3f946f11d61
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:25 +00:00
Toni Saario
3802e21afe Enable conan revisions mode
Pick-to: 6.1
Change-Id: I0fb9d6943cf0e6e54f631314a67348f703c31e41
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:23 +00:00
Toni Saario
7381cbeca8 Update windows git version
Older git version does not allow fetching specific revisions.
This makes it impossible to fetch the integrations revision of
the repository.

Pick-to: 6.1
Change-Id: I513b0d1abb097d139f730ef0cdf2577b9d02e9f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:22 +00:00
Toni Saario
f83567b7f5 Provision conan on ubuntu 18 and macos 11
Pick-to: 6.1
Change-Id: Ie11e8bb2b39acd3ab6229cb211c37500cbb7ed77
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:19 +00:00
Heikki Halmet
26c97222c1 Provisioning: Install Nodejs using pkg instead of Brew
Openssl is one of Nodejs dependencies when installing it via
Homebrew which is causing issues with actual openssl source build during
provisioning

Pick-to: 6.1
Pick-to: 6.0
Pick-to: 6.1.0
Pick-to: 5.12
Task-number: QTQAINFRA-4402
Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-11 15:28:55 +00:00
Jani Heikkinen
9980240e33 Drop Ubuntu 18.04 target from qtbase.yaml as well
Pick-to: 6.1
Change-Id: I033d8aa10b69a110fb1f51fd0620deba7ac559a9
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-04-09 14:42:15 +03:00
Jani Heikkinen
7a8094dc9d Drop unnecessary ci and packaging configurations
- Drop Ubuntu 18.04 from CI; we aren't supporting it as development host
in Qt6. And we aren't using its prebuild binaries anywhere
- Drop 'Packaging' feature from QNX builds; we aren't packaging those
- Drop 'Packaging' feature from openSUSE builds; we aren't packaging those

Pick-to: 6.1
Change-Id: Ic5c6e0e1c480946380cbcf4b01133caffe7a71e0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-09 10:42:15 +03:00
Matti Paaso
9ad3578bc2 Add qt-creator platform configurations
Pick-to: 6.1
Task-number: COIN-491
Change-Id: I18b70a7157931f9fe0d42abf71f1bab6de6199c3
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-09 05:07:57 +00:00
Qt Submodule Update Bot
b3db9e5263 Update submodules on 'dev' in qt/qt5
Change-Id: I7ade10e3498aeaf121d1da1a066ceda3a0d05669
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-09 05:26:11 +03:00
Qt Submodule Update Bot
453ba56e32 Update submodules on 'dev' in qt/qt5
Change-Id: I9ee482e880e8e3d44a7b2c273b15156df0badda9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-08 23:53:26 +03:00
Marianne Yrjänä
50962fb204 Make QNX builds significant
All components now pass QNX builds so they can be made significant.
Old QNX6.6 removed from provisioning.

Task-number: QTQAINFRA-4286
Pick-to: 6.1
Change-Id: Idb6abcc1d61030e1edba9467044fe59d17ee9d82
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-08 20:55:04 +02:00
Qt Submodule Update Bot
a2372433e7 Update submodules on 'dev' in qt/qt5
Change-Id: Iea10f45a41e3e781ab954ad0b779e0be62b83d1e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-08 17:07:55 +03:00
Toni Saario
6f4acb8746 Disable sccache on QNX targets
There appears to be issues with sccache on q++/qcc compiler that
lead tha false positive cache hit and build failures.

Task-number: QTQAINFRA-4391
Pick-to: 6.1
Change-Id: I84f38242e6de4094933300bd535686206c849960
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-08 10:30:14 +00:00
Samuli Piippo
5fba592288 Remove old QNX provisionings
QNX 6.6 and 7.0 are not needed since they don't support Qt6.

Change-Id: I56d71bbebf421d1a5d952815878217b0bfdc85b2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-08 07:18:50 +02:00
Heikki Halmet
c84925c512 Provisioning: Reset Time Zone for macOS 10.14
Setting Time Zone for macOS 10.14 seems to be flaky. Let's reset it. If
it still fails to set it then exit the script execution.

Task-number: QTBUG-92174
Change-Id: I07b28d0511d8fc097a1da43b78de9a5131f6bfa7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit ba149a162b)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-06 04:36:07 +00:00
Heikki Halmet
61d69b068f Provisioning: Upgrade Xcode to version 11.3.1 for macOS 10.14
Xcode 11.3.1 is the latest supported version for macOS 10.14
It seems that in macOS 10.14 xip-package can't be expanded
through mount. It need to be fetched first.

Pick-to: 6.0
Pick-to: 6.1
Change-Id: I8c53787a2edde6b50abc7ec099ecc10b7515df2e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-06 06:36:01 +02:00
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