lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,574 Commits 118 Branches 270 Tags
6a85c577bbfcd7b471d45d0e0cee612a9af4b153
Commit Graph

4574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Qt Submodule Update Bot
91d6371aa7 Update submodules on '6.1' in qt/qt5 
Change-Id: I8647d06c7156328d1fdadd542e95158b62d00bfd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-06 03:15:24 +02:00
Qt Submodule Update Bot
5dccb615d0 Update submodules on '6.1' in qt/qt5 
Change-Id: Iae0b767cad3dc48eb369a810f3b4f60125646b3c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-05 23:05:31 +02:00
Qt Submodule Update Bot
ed885dcd96 Update submodules on '6.1' in qt/qt5 
Change-Id: I3dbcbdbe64160ff1fc0dba5d8da2d3f9766d2e7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-05 16:05:40 +02:00
Qt Submodule Update Bot
dfd068a159 Update submodules on '6.1' in qt/qt5 
Change-Id: I2578a59e7703b50da1726f68841f34a644f88983
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-04 10:03:58 +02:00
Qt Submodule Update Bot
598a978aec Update submodules on '6.1' in qt/qt5 
Change-Id: I517d4c07abce5ad46e086e4bb2bc11f8cf83ca31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-04 05:45:26 +02:00
Heikki Halmet
a41f41590b 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.

Task-number: QTBUG-91352
Change-Id: I2a3d186bc04b1f54f14ed95f0588d18bd63814c4
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 8843f51866)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-03-03 17:03:35 +00:00
Qt Submodule Update Bot
a62d1f6060 Update submodules on '6.1' in qt/qt5 
Change-Id: I3c61d3853d29022cc8eddb7d6c59c9b02573c278
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-03 09:28:25 +02:00
Jani Heikkinen
58a2d3ab27 Fix branch for additional libraries 
We are in '6.1' so '6.1' needs to be used instead of 'dev'

Change-Id: I89db2a5d33658ddb26b51abec41c5e9735850dce
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
 2021-02-26 10:14:20 +02:00
Topi Reinio
fada0bd6de 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.'

Change-Id: I12133b30b504e536eaf68e4260df5aed28543eb6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 8ebf0095c3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-25 16:19:28 +00:00
Heikki Halmet
790b582893 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
Heikki Halmet
48d184635c 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

Change-Id: Icfce35acec8baa4488089e555c311a063455c24b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 0a6511c1e7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-25 07:39:38 +00:00
Qt Submodule Update Bot
025759926d Update submodules on '6.1' in qt/qt5 
Change-Id: I9ee42d73e1cd7db8f5418110b6386381e72fa5a4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-24 02:33:45 +02:00
Qt Submodule Update Bot
0c3bc777ad Update submodules on '6.1' in qt/qt5 
Change-Id: I3b7d6c8c5dc138d9afe2cc9260100b21b27d8ec3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-23 22:40:10 +02:00
Qt Submodule Update Bot
bf77b43a6f Update submodules on '6.1' in qt/qt5 
Change-Id: I60b1a1588833e98a13c3eb57bc65964dd8b5a513
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-23 16:36:44 +02:00
Qt Submodule Update Bot
b30917ecd2 Update submodules on '6.1' in qt/qt5 
Change-Id: Id986efbefb9a701c2737d1abce48ebf639043d30
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.1.0-beta1 		2021-02-23 06:52:22 +02:00
Qt Submodule Update Bot
90c9e45764 Update submodules on '6.1' in qt/qt5 
Change-Id: I49f4a646332f3d97556d73e2fdf4caa658343d3c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-23 02:47:14 +02:00
Qt Submodule Update Bot
dc079f99ff Update submodules on '6.1' in qt/qt5 
Change-Id: I81fd035c10796be173b9ec10ad82aedeca50eac9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-22 19:40:03 +02:00
Samuli Piippo
5670dccefd Make QEMU builds significant 
All tests pass, remove InsignificantTests from QEMU builds.

Task-number: QTBUG-86238
Change-Id: Ia3d2b9ef3ce06cbdf67c99bcbe64f36f7bbdb1ec
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b6c8b8f470)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-22 15:44:29 +00:00