Commit Graph

4614 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
c9eba7d99f Update submodules on 'dev' in qt/qt5
Change-Id: I5768d7983e6c75a9be576ab91c8fdebe0367b836
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-20 14:32:14 +03:00
Heikki Halmet
aa5112af99 Add Red Hat 8.2 to CI
Red Hat 8.2 is the latest version with extended update
support. In the end Red Hat 8.2 will replace CentOS 8.3

Task-number: QTQAINFRA-4322
Change-Id: Iaa2ef452e7e6608349ba7438bbc5d25ddb35fa2a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-20 08:38:20 +03:00
Johanna Äijälä
03821e82a5 Provisioning: Fix Squish for Qt6 on macOS
Add correct Squish package to the 'squish_for_qt6' location.

Pick-to:6.1
Pick-to:6.0

Change-Id: Ib997092a5d6350d9b7298d7cc8baf5a2afaca702
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-20 04:44:11 +00:00
Qt Submodule Update Bot
2737415067 Update submodules on 'dev' in qt/qt5
Change-Id: I6ab6399438dca0ad9e1957e0055159a069912e4e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-20 05:09:23 +03:00
Qt Submodule Update Bot
f3fafc2591 Update submodules on 'dev' in qt/qt5
Change-Id: I3ee4027abb4f1571ce9a66a4c7e8beebccdf68ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-19 21:04:53 +03:00
Heikki Halmet
9200ee7384 Provisioning: Upgrade MSVC 2019 version to 16.9.4
Pick-to: 6.1
Pick-to: 6.1.0
Pick-to: 6.0
Task-number: QTQAINFRA-4117
Change-Id: Iefb5c8b97b3f56d9cdb358dbbf70d4c9de1b7d1b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-19 13:01:38 +03:00
Heikki Halmet
a4b61379ca Provisioning: Resize ulimit value for open files
Linker for Qt Webengine builds needs to open multiple files.
Without this it will hit the limit

Pick-to: 6.1
Pick-to: 6.1.0
Pick-to: 6.0
Task-number: COIN-699
Change-Id: I53b8c38a4f719714971ca6a4b65349716a873170
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-19 13:01:22 +03:00
Qt Submodule Update Bot
e468db267a Update submodules on 'dev' in qt/qt5
Change-Id: I0c79807c5172b19ea9698c3c85ef41d3b8d1c170
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-16 20:52:15 +03:00
Alexandru Croitor
002b6f075c CMake: Use qtbase's version as the top-level project version
This avoids the need to bump the qt5.git project version when
branching the next minor Qt version.

Pick-to: 6.1 6.0
Task-number: QTBUG-92861
Change-Id: Ib20ab614caefece00bd9e0172d9269077239ba6a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-15 13:27:10 +02:00
Qt Submodule Update Bot
cfd7838615 Update submodules on 'dev' in qt/qt5
Change-Id: Ic52240c1f49a55a0bff0f01965dc942dbde8cc4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-15 07:31:36 +03:00
Qt Submodule Update Bot
29f45fdb25 Update submodules on 'dev' in qt/qt5
Change-Id: I081ea134beb3d1f4ca3abfeee9b6cbe620860e8a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-14 14:43:51 +03:00
Jani Heikkinen
bba6c1bd70 Revert "Add qttools as additional dependency to additional libraries"
This reverts commit 919aa17249.

Reason for revert: additional libraries will be part of qt5.git build -> we don't need to have qttools as dependency there anymore

Change-Id: If77278c030be961d2282ff5c049d5ec6b03a578b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-04-14 09:19:30 +00:00
Qt Submodule Update Bot
7a7c685f3b Update submodules on 'dev' in qt/qt5
Change-Id: I62923f0c4d5f70d57a709c787052a1cb7109e958
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-14 06:24:19 +03:00
Qt Submodule Update Bot
7193f979a9 Update submodules on 'dev' in qt/qt5
Change-Id: Ic5526cfb4a09bb2a36e524c817a8513a30fe34f7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-13 22:27:59 +03:00
Assam Boudjelthia
53fc7d424d Update NDK to r22b
Qt quick 3D apps crash because of a bug caused by NDK r21
https://github.com/android/ndk/issues/1148, NDK r22b solves
the problem.

Pick-to: 6.1 6.1.0
Task-number: QTBUG-91782
Task-number: QTBUG-92075
Change-Id: I92098c26f3bd9fcfc342ced42c9a81f1e34af8d6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 12:19:04 +00:00
Heikki Halmet
ca14882321 Provisioning: Install prebuilt OpenSSL Android
OpenSSL 1.1.1 can't be build against Android NDK 22. Current OpenSSL
prebuilt was made against NDK 21.

Pick-to: 6.1.0
Pick-to: 6.1
Task-number: QTBUG-92075
Change-Id: I0e8a3017a9482ef269d736a8702b29b6bec1c2b2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-04-13 12:19:04 +00:00
Tor Arne Vestbø
4a9d291ca6 Cache list of submodules
Otherwise running cmake with QT_BUILD_SUBMODULES set in the environment
would not persist for later cmake runs without the environment set,
resulting in trying to reconfigure with every single available module.

Change-Id: I85e57b16fdc8e51cae8fff083c7a7536b0ed16f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 14:19:04 +02:00
Heikki Halmet
027f8ccb08 Provisioning: Add Vulkan installation for Ubuntu 20.04
Vulkan is needed by examples

Pick-to: 6.1
Pick-to: 6.1.0
Pick-to: 6.0
Task-number: QTBUG-92545
Change-Id: I2f814e452c88c04919b26eb42e90bac18356bbe7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2021-04-13 10:02:22 +00:00
Qt Submodule Update Bot
546c9fb3c1 Update submodules on 'dev' in qt/qt5
Change-Id: I0a0c782c38eccf3bc83e8c4372011a7f366c0f80
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-13 10:34:06 +03:00
Toni Saario
00069e6eaa Add a ARM64 macOS target
This patch adds a macOS target that is run on the ARM64 macs.

Task-number: QTQAINFRA-4012
Change-Id: I255a288551846ae3328f614b64668fdc5ede2391
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 09:34:00 +03:00
Qt Submodule Update Bot
00e5688e28 Update submodules on 'dev' in qt/qt5
Change-Id: I901b17a762cfaee88c47a6125b23f761ad5a7b93
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-13 06:20:10 +03:00
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