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,592 Commits 118 Branches 270 Tags
d1601aa0f94de81fe6b1651a2a3f5ce0a52a1ed3
Commit Graph

4592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Heikki Halmet
88c07c72e2 New images with accessibility for squish for macOS 10.15 and 11.0 
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>
(cherry picked from commit c8a55fece5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-22 12:43:18 +00:00
Qt Submodule Update Bot
394b2cb94e Update submodules on '6.1' in qt/qt5 
Change-Id: If0f285a85a742f884e671c62a76a0c2133647040
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-22 10:05:08 +02:00
Samuli Piippo
a415711500 Add platform configs for qtdeviceutilities 
Change-Id: Ica3aa46e3302dc9b46c64bbef222e3e958f56a35
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit cd888a07fe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-19 05:32:32 +00:00
Samuli Piippo
b3182a84b5 Update platform configs for qdb 
Use cmake platforms to build qdb.

Change-Id: I9d7e452bf70699799527ea38c97ec64a8fa0fc10
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 7b3e2f369d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-19 05:32:32 +00:00
Qt Submodule Update Bot
7d8b27fb63 Update submodules on '6.1' in qt/qt5 
Change-Id: I80b214d463b8c37a7daf0f5723b9f5b16292664b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-19 05:14:12 +02:00
Qt Submodule Update Bot
7f2beb5fe6 Update submodules on '6.1' in qt/qt5 
Change-Id: I41ac92f8bb6e7d11a8497bd7f50b883ba9f1c5c1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-18 23:01:55 +02:00
Qt Submodule Update Bot
041fc90b46 Update submodules on '6.1' in qt/qt5 
Change-Id: Ie1c878fc5e89409c64195d87c07a1a872eaf85c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-18 16:08:26 +02:00
Heikki Halmet
963e5ddd43 Add Insignificant flag for qtbase Android target with Ubuntu 18.04 
Can't start emulator with Ubuntu 18.04

Task-number: QTBUG-91180
Change-Id: I33bbbe47d3f0861778b295ccf797b5a99a99c58a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 36f1125927)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-17 12:28:26 +00:00
Topi Reinio
ad62610ca0 init-repository: Allow 'tqtc-' prefix for qt5 repository 
Change-Id: Ic4b14e4e6efd43e54a241000e090981ce8b6c651
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 6f7f1cd550)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-17 11:59:05 +00:00
Heikki Halmet
61cc4367ed Add Ubuntu 18.04 for Qt6 binary packages 
We need to start using Ubuntu 18.04 with Qt6 binary package
targets. Ubuntu 18.04 includes older GLIBC version which
shouldn't cause any problems with linux distributions supported
by Qt6

Tests will be executed with Ubuntu 20.04.

Task-number: QTQAINFRA-4193
Change-Id: Icb189c509351ff080a2c6431299cc0be6ba8adc1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit b64b4b169e)
 2021-02-16 14:00:29 +02:00
Qt Submodule Update Bot
6c1fe15f0f Update submodules on '6.1' in qt/qt5 
Change-Id: I5a6b22fdbbca1ccff10765f4441e5bf4639f1d7f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-13 04:23:52 +02:00
Qt Submodule Update Bot
b079c012d4 Update submodules on '6.1' in qt/qt5 
Change-Id: I04da3b634676c2d4fa084d2b5d6d1100f65b20bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-13 00:15:02 +02:00
Qt Submodule Update Bot
3f80dcdc05 Update submodules on '6.1' in qt/qt5 
Change-Id: I8588e8d58015c6acbac3e765a14d84692bc279c1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-12 13:58:46 +02:00
Qt Submodule Update Bot
55b0bc23ac Update submodules on '6.1' in qt/qt5 
Change-Id: Ifa5ede715396bf8754a15bb457950f42858b86af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.1.0-alpha1 		2021-02-12 11:10:24 +02:00
Heikki Halmet
bcad6a23df Provisioning. Set Wayland enable as false for CentOS 8.3 
In CentOS 8.3 seems to be bug with setting Wayland instead of x-session.

Task-number: QTQAINFRA-4246
Change-Id: I1099ca7ef5425f7383ab8a2e9988efeb42a858e8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ee5f8fa6cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-12 06:08:30 +00:00
Qt Submodule Update Bot
2ae5ac5dc2 Update submodules on '6.1' in qt/qt5 
Change-Id: I60b7c84d66f944aebc646f8acf45b98cda796b0b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-12 05:45:21 +02:00
Qt Submodule Update Bot
7485ae5908 Update submodules on '6.1' in qt/qt5 
Change-Id: Ia8560e0769bf6340671487ec8fa1490686220182
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-11 11:40:18 +02:00
Qt Submodule Update Bot
7b7ab4088c Update submodules on '6.1' in qt/qt5 
Change-Id: I3545876e137c8f638e3d0ebaaa74d121d8fe2539
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-10 10:55:46 +02:00
Qt Submodule Update Bot
ae0eb06a3a Update submodules on '6.1' in qt/qt5 
Change-Id: Ic463cd82a0016324d528f9e2814f4858045e8067
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-10 05:51:43 +02:00
Qt Submodule Update Bot
e2c6b9e581 Update submodules on '6.1' in qt/qt5 
Change-Id: Ic63a405cbe79572d297ca61bf21564c5b31c1420
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-10 01:22:29 +02:00
Qt Submodule Update Bot
df50ad4274 Update submodules on '6.1' in qt/qt5 
Change-Id: I31deb28cbc9602d368abe540141982539833f8b7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-09 17:59:39 +02:00
Qt Submodule Update Bot
e0fcf126c6 Update submodules on '6.1' in qt/qt5 
Change-Id: Ib3b6d409bb7ee45e8a5b61a6ff10a02130476f32
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-09 10:00:53 +02:00
Paul Wicking
4bcbf25951 Fix init-repository 
Introducing additionalLibrary to .gitmodules
broke init-repository. Add the new state also
here.

Task-number: QTBUG-90669
Change-Id: I3ac9960427ef2fd8fe39b508b69459f4fcf81ca7
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 414165e366)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-09 06:38:17 +00:00
Qt Submodule Update Bot
117bdd9867 Update submodules on '6.1' in qt/qt5 
Change-Id: I1da8f5dc4d4f9311bb4e06e91fc1fa195578abaf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-08 11:22:31 +02:00
Jani Heikkinen
b194786ec9 Add qttools as additional dependency to additional libraries 
qttools is needed to be able to build documentation

Fixes: QTBUG-90996
Change-Id: I27f101dc4294f830b9915e1530d660cfe12aeabe
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 919aa17249)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-08 07:48:40 +00:00
Qt Submodule Update Bot
0adddf1ebe Update submodules on '6.1' in qt/qt5 
Change-Id: I711d62bf51d982ebe7979c9f7a0486554f93fda5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-08 05:45:28 +02:00
Jani Heikkinen
3a8a4d2b11 Add Qt 6.1.0 Additional libraries 
Set status to additionalLibrary to ones already in .gitmodules as ignore status
Add missing ones with status = additionalLibrary

Task-number: QTBUG-90669
Change-Id: I5f7518c516d10ae68fb5cf20851b36bde4fbc0b2
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit dba2b570b9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-07 11:22:54 +00:00
Qt Submodule Update Bot
bda4400579 Update submodules on '6.1' in qt/qt5 
Change-Id: Id82662de9c66af00bd754a002b12673d61a483c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-06 12:27:59 +02:00
Qt Submodule Update Bot
124aba8e7a Update submodules on '6.1' in qt/qt5 
Change-Id: I3c6b9da8f7abaebd829d1bd4d8e836e0f72d2bdd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-06 07:45:14 +02:00
Qt Submodule Update Bot
d2f01f17c2 Update submodules on '6.1' in qt/qt5 
Change-Id: Iff46060a156725633eab3587daeb419f121900db
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-06 00:55:35 +02:00
Cristian Adam
4e3b53f228 Update QDoc libclang to 11.0 
Change-Id: I1cc74a1efb702d32d99749ec681e37345579c5b7
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit d3406fedd1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-02-05 21:12:54 +00:00
Qt Submodule Update Bot
efb6f87cf6 Update submodules on '6.1' in qt/qt5 
Change-Id: If25bdba5bbc85398523a3e648b6968be40baacfb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-02-05 18:52:08 +02:00