Commit Graph

4592 Commits

Author SHA1 Message Date
Toni Saario
d1601aa0f9 Add conan to path
Change-Id: I90e028409f606a703fd9b567a221f3f946f11d61
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 32579bc3c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-12 07:21:53 +00:00
Toni Saario
88b3474bcf Enable conan revisions mode
Change-Id: I0fb9d6943cf0e6e54f631314a67348f703c31e41
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 3802e21afe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-12 07:21:47 +00:00
Toni Saario
1308663fd6 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.

Change-Id: I513b0d1abb097d139f730ef0cdf2577b9d02e9f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 7381cbeca8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-12 07:21:41 +00:00
Toni Saario
0c6dc883e5 Provision conan on ubuntu 18 and macos 11
Change-Id: Ie11e8bb2b39acd3ab6229cb211c37500cbb7ed77
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit f83567b7f5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-12 07:21:35 +00:00
Toni Saario
f5c5309067 Disable network LSO/TSO on linux and macOS VMs
LSO/TSO causes problems handling network packets and deteriorates the
network speed to below 1MB/s.

Task-number: QTQAINFRA-4241
Change-Id: Ib999035668eefe51d59715c9a18f42c9e3dfdf21
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit db7926c715)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-11 20:21:19 +00:00
Heikki Halmet
42ee3f18fe 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

Task-number: QTQAINFRA-4402
Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 26c97222c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-11 15:57:09 +00:00
Jani Heikkinen
7722922b17 Drop Ubuntu 18.04 target from qtbase.yaml as well
Change-Id: I033d8aa10b69a110fb1f51fd0620deba7ac559a9
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 9980240e33)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-09 12:12:10 +00:00
Jani Heikkinen
4aed038baf 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

Change-Id: Ic5c6e0e1c480946380cbcf4b01133caffe7a71e0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 7a8094dc9d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-09 08:22:03 +00:00
Matti Paaso
ee497a40f1 Add qt-creator platform configurations
Task-number: COIN-491
Change-Id: I18b70a7157931f9fe0d42abf71f1bab6de6199c3
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit 9ad3578bc2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-09 06:22:23 +00:00
Qt Submodule Update Bot
39ba7a7d99 Update submodules on '6.1' in qt/qt5
Change-Id: Ib450df7f19e6fe13135b1d23cb3114ce70591b82
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-09 08:41:36 +03:00
Qt Submodule Update Bot
06da143671 Update submodules on '6.1' in qt/qt5
Change-Id: I91e6506fddb4709a538512cd383dfe4fbc1b755f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-09 04:12:22 +03:00
Marianne Yrjänä
9ef059fd02 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
Change-Id: Idb6abcc1d61030e1edba9467044fe59d17ee9d82
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 50962fb204)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-08 20:35:35 +00:00
Qt Submodule Update Bot
ae53d34088 Update submodules on '6.1' in qt/qt5
Change-Id: I6879f342b87c07e9dfd9111b258a3cd029595019
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-08 23:35:10 +03:00
Toni Saario
dca7cd6fb8 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
Change-Id: I84f38242e6de4094933300bd535686206c849960
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 6f4acb8746)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-08 14:08:00 +00:00
Qt Submodule Update Bot
28bef7a49a Update submodules on '6.1' in qt/qt5
Change-Id: If6da369761695ec9e23228b9e906a50954cab5d7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-07 23:20:37 +03:00
Qt Submodule Update Bot
7f4029e0dc Update submodules on '6.1' in qt/qt5
Change-Id: I5f47d5cf58e16c3599d10cfc5cd3476f823369bd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.1.0-beta3
2021-04-06 06:45:45 +03:00
Qt Submodule Update Bot
9938bdeaf1 Update submodules on '6.1' in qt/qt5
Change-Id: I365868f578ba0f55975a7d126f195e50bbca415d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 16:31:29 +03:00
Qt Submodule Update Bot
1f9f80366c Update submodules on '6.1' in qt/qt5
Change-Id: I587b3c71f3b1f4f6b6fd36808d109f75407dfa3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 10:05:18 +03:00
Kai Köhne
6a85c577bb 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.

Fixes: QTBUG-92257
Change-Id: I024e812e9debd3c83b24bf306ff0375b2cb08659
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 1397f8c123)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-31 09:39:29 +00:00
Heikki Halmet
ea508a87a8 Provisioning: Disable RunTime broker
On some cases RunTime broker might eat huge amount of CPU

Change-Id: Ie01b4e1a48e2f9e7e0deb9970160ffc92854d79b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 3444b91634)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-30 14:55:18 +00:00
Qt Submodule Update Bot
18aebc6347 Update submodules on '6.1' in qt/qt5
Change-Id: Ia303bba9d248547c425839aea4d0dd5110ba8bd1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-30 07:35:29 +03:00
Qt Submodule Update Bot
f313c704ad Update submodules on '6.1' in qt/qt5
Change-Id: Ic62e30c724dfc7531801527be044a444afbb690a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-29 12:27:58 +03:00
Johanna Äijälä
eb0962abdd 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.

Change-Id: I8605204118015feb347268c335ef731ff99e3c68
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 02d4c34b7d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-28 15:29:03 +00:00
Heikki Halmet
3a49fa3b96 Provisioning: Upgrade Xcode to version 12.4 for macOS 10.15 and 11.0
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>
(cherry picked from commit 7a027b4dfd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-26 17:15:49 +00:00
Heikki Halmet
1391b297e1 Provisioning: Install GCC toolset for CentOS
GCC toolset provides upgraded GCC version for CentOS.

Change-Id: Ia62c7abf21eeed5d65c6b2e35fe1013d839cfa24
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 066964d275)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-26 17:15:49 +00:00
Jani Heikkinen
4d6b15b0b6 Revert "Add qttools as additional dependency to additional libraries"
This reverts commit b194786ec9.

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: Ib4177b35ecd58ea682a69f6e4e68e4ddd5e24e49
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-03-26 11:43:59 +00:00
Jani Heikkinen
55874781a1 Change all 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.

Task-number: QTBUG-91796
Pick-to: dev
Change-Id: Ia154b62d5c1a997575d844aaf21f399a24626748
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2021-03-26 13:43:44 +02:00
Jani Heikkinen
4f3dac297e Update submodules in Qt 6.1
Change-Id: If62b08a88735d363870b510a29947b8335f9569b
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2021-03-26 13:43:39 +02:00
Paul Wicking
918855032f Update documentation for init-repository
There's no mention of additionalLibrary status.

Change-Id: I3ebf8fdc6dcfc01392b1ab5a42734cef81d6fc61
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit ed139ea47e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-26 07:35:07 +00:00
Qt Submodule Update Bot
e017897c6a Update submodules on '6.1' in qt/qt5
Change-Id: Ia71ea6404ca4d02a9041e8dce147b75e68f38e2a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-25 13:13:05 +02:00
Heikki Halmet
ecd6cdc88c 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.

Change-Id: I983db655c497105c3154ab64b170a8ed8739a59c
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit 152a80ec1d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-24 06:45:21 +00:00
Qt Submodule Update Bot
72675edae8 Update submodules on '6.1' in qt/qt5
Change-Id: I37895ada72590c1151cbb96bec243009fede77df
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-24 00:30:36 +02:00
Heikki Halmet
6f8b6a1535 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>
(cherry picked from commit fb65f86083)
2021-03-23 07:17:42 +02:00
Qt Submodule Update Bot
f87e3d8579 Update submodules on '6.1' in qt/qt5
Change-Id: I4053082e1534339cd3c217ee57e9cb3990004050
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-23 02:21:23 +02:00
Qt Submodule Update Bot
73dad71b34 Update submodules on '6.1' in qt/qt5
Change-Id: I9a51f10d0069ffa8c80b7a7e95c7227053e89544
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-22 10:55:24 +02:00
Qt Submodule Update Bot
0569b55089 Update submodules on '6.1' in qt/qt5
Change-Id: Icf88c51297e40e5eb4f62a45a864101693e77c30
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-22 05:45:33 +02:00
Qt Submodule Update Bot
648d3fbd0e Update submodules on '6.1' in qt/qt5
Change-Id: I6274aba818b7e9c256f18fc8a7c1f62a0586c2ea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-18 04:28:02 +02:00
Qt Submodule Update Bot
54d68ef062 Update submodules on '6.1' in qt/qt5
Change-Id: Idd1ee66a3fa9b52294cc1d536fad4b65b2b33d32
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-18 01:15:34 +02:00
Qt Submodule Update Bot
56a4d9f0a0 Update submodules on '6.1' in qt/qt5
Change-Id: Ic2b391afaaef0386fb80e56d317f03e387975cc7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-17 19:02:44 +02:00
Qt Submodule Update Bot
9c98436644 Update submodules on '6.1' in qt/qt5
Change-Id: I567d543d8746ad23bcd455cf1001fb43d30d008f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-17 03:25:44 +02:00
Qt Submodule Update Bot
703d923b0d Update submodules on '6.1' in qt/qt5
Change-Id: Id42ad1ecd7491ec2adae6c04087af7d7acb65145
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-16 19:47:52 +02:00
Marianne Yrjänä
bb51a64003 Add QNX7.1 to CI
Task-number: QTQAINFRA-3768
Change-Id: I9c0aa78fad9c6a1263e75b06fa954c335f4b6ec2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 036729ed05)
2021-03-16 13:42:45 +00:00
Qt Submodule Update Bot
d6eb043bb9 Update submodules on '6.1' in qt/qt5
Change-Id: I410ee553812448b0fc937df8c4b1561a85d09be0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-16 12:11:50 +02:00
Qt Submodule Update Bot
04ee8998b4 Update submodules on '6.1' in qt/qt5
Change-Id: I93eeb1f7ff2868cb9f934201dca89018cf966db9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.1.0-beta2
2021-03-12 20:49:22 +02:00
Qt Submodule Update Bot
6fe5602897 Update submodules on '6.1' in qt/qt5
Change-Id: I06c3b417352b0deb875f0b04ba24d690d5cb7831
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-12 11:08:14 +02:00
Qt Submodule Update Bot
5cd58bd851 Update submodules on '6.1' in qt/qt5
Change-Id: I6b078f345acbf971be0947341b4085f86f67d4f9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-12 06:11:26 +02:00
Qt Submodule Update Bot
130388acbd Update submodules on '6.1' in qt/qt5
Change-Id: I99843339046d0bc00da17ce459896b8b1c234f85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-11 09:41:52 +02:00
Qt Submodule Update Bot
4e2b9e0552 Update submodules on '6.1' in qt/qt5
Change-Id: I4d0d734391d36ab806e6a955ebe1cc2668ea1285
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-09 10:32:35 +02:00
Qt Submodule Update Bot
fb46ac4698 Update submodules on '6.1' in qt/qt5
Change-Id: Iefdb21860cbf8053c9fff29333865d7bece0c673
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-09 05:45:17 +02:00
Qt Submodule Update Bot
a0fa9081c2 Update submodules on '6.1' in qt/qt5
Change-Id: I78ea65c2c25e20c29a9b636dd6649ef98d8189d2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-06 07:02:51 +02:00