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

4531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Forward Merge Bot
b4ed762397 Merge branch 6.0 into pyside6.0 
Change-Id: Idaaa6254cad34632941f175e8dfb5620020a3828
 2021-04-17 11:15:05 +00:00
Qt Submodule Update Bot
c99c2e8510 Update submodules on '6.0' in qt/qt5 
Change-Id: I87b67fc41449726385f177cc2eb24bb851d5dadf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-17 09:47:55 +03:00
Qt Submodule Update Bot
40fbad4c27 Update submodules on '6.0' in qt/qt5 
Change-Id: I66ed9db9b37fc3dad03da4bbec96fe456a9e70a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-17 05:28:57 +03:00
Qt Submodule Update Bot
c15f11cc06 Update submodules on '6.0' in qt/qt5 
Change-Id: Ib1a4d1dd25985d8d63fd9ea789dcb672149a28c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-16 23:35:52 +03:00
Alexandru Croitor
214f78598f 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.

Task-number: QTBUG-92861
Change-Id: Ib20ab614caefece00bd9e0172d9269077239ba6a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 002b6f075c)
 2021-04-16 20:43:31 +02:00
Qt Forward Merge Bot
c00a3c1ec6 Merge branch 6.0 into pyside6.0 
Change-Id: Ic92fc242d42346aea1dd27567c7425f11d5b3462
 2021-04-16 11:15:28 +00:00
Heikki Halmet
20ddde5215 Provisioning: Add Vulkan installation for Ubuntu 20.04 
Vulkan is needed by examples

Task-number: QTBUG-92545
Change-Id: I2f814e452c88c04919b26eb42e90bac18356bbe7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 027f8ccb08)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-04-16 09:52:21 +03:00
Qt Submodule Update Bot
2bf391ebd1 Update submodules on '6.0' in qt/qt5 
Change-Id: Ie62c52afa309c3daef66ea46699d08b5dc91ca4a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-15 07:56:42 +03:00
Qt Submodule Update Bot
ed288f9132 Update submodules on '6.0' in qt/qt5 
Change-Id: I8922ea95a484952c94fa88322e016e2965f4ef08
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-14 16:53:05 +03:00
Qt Forward Merge Bot
62900e475d Merge branch 6.0 into pyside6.0 
Change-Id: I7b044e3bd4d3648e73cb355e42a14d4aabff5da1
 2021-04-14 11:15:44 +00:00
Qt Submodule Update Bot
27b951ae11 Update submodules on '6.0' in qt/qt5 
Change-Id: I43c98e080cdaedb7312405be5d559ae5b51bd3d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-14 06:45:08 +03:00
Qt Forward Merge Bot
21fa5094fb Merge branch 6.0 into pyside6.0 
Change-Id: Ic8346bc6c414ad00b602e76846ae0e991ecbf004
 2021-04-13 11:15:06 +00:00
Heikki Halmet
974d3efd81 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.

Change-Id: I8c53787a2edde6b50abc7ec099ecc10b7515df2e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 61d69b068f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-13 09:23:18 +00:00
Heikki Halmet
4578721c38 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>
(cherry picked from commit c84925c512)
 2021-04-13 07:46:42 +03:00
Heikki Halmet
47eb374631 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)
 2021-04-13 07:46:41 +03:00
Qt Forward Merge Bot
61c75a8a78 Merge branch 6.0 into pyside6.0 
Change-Id: Ifbe71d5f2301bf7f4af32ad283c0a006583aee80
 2021-04-09 11:15:04 +00:00
Qt Submodule Update Bot
46b38f0d30 Update submodules on '6.0' in qt/qt5 
Change-Id: I7d887288d7bdae8dcad2340805cc12cd939584bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-09 09:07:28 +03:00
Qt Submodule Update Bot
b588495693 Update submodules on '6.0' in qt/qt5 
Change-Id: Iffbdf28f5c0cbb7f7805045835e0b662eb571ebd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-09 03:16:17 +03:00
Qt Submodule Update Bot
cb3309e4fb Update submodules on '6.0' in qt/qt5 
Change-Id: I2cfc68cd3059f9f423dadc6719351ccc1b0a0c9f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-08 14:04:58 +03:00
Qt Forward Merge Bot
f995d4c927 Merge branch 6.0 into pyside6.0 
Change-Id: I2c9feb7c493239cde76e2a77da81b9e7928b76a4
 2021-03-31 11:15:03 +00:00
Qt Submodule Update Bot
5a642020c3 Update submodules on '6.0' in qt/qt5 
Change-Id: I7134ea8c8cce3b127337725245f12b5f9323b801
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-31 08:02:22 +03:00
Heikki Halmet
af56103607 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)
 2021-03-30 15:22:23 +03:00
Qt Forward Merge Bot
85753e1c50 Merge branch 6.0 into pyside6.0 
Change-Id: Ib14f9942c3ce3d4e99f7d0eeeb19e706fb2617e0
 2021-03-30 11:15:03 +00:00
Qt Submodule Update Bot
31ff39ab7b Update submodules on '6.0' in qt/qt5 
Change-Id: Ib6f70844608788752db228e93d1f8e190772f1d8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-30 09:59:47 +03:00
Qt Forward Merge Bot
5600a584b7 Merge branch 6.0 into pyside6.0 
Change-Id: I84b99d38e515a322d23839b473972f3d1da981b1
 2021-03-29 11:15:03 +00:00
Qt Submodule Update Bot
9f5f381673 Update submodules on '6.0' in qt/qt5 
Change-Id: Iba76968d0845b67082705a6fe523407d03c2ba41
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-29 08:29:45 +03:00
Johanna Äijälä
ba6d7235a1 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
Qt Forward Merge Bot
9934879510 Merge branch 6.0 into pyside6.0 
Change-Id: I461dae6eff735c0d39b44dd81b8a1013aba19748
 2021-03-27 11:15:03 +00:00
Heikki Halmet
2e88845015 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
Simo Fält
e1105e5315 Update additional submodules 
Change-Id: I22d612f195508a8317bb4e41ec472c8a2c0b6e23
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2021-03-26 15:56:52 +02:00
Qt Submodule Update Bot
62efea7477 Update submodules on '6.0' in qt/qt5 
Change-Id: I361b0238a67f8522430bd9e4da153d16e88d1671
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-26 15:35:57 +02:00
Simo Fält
417db6993d Merge commit 'b021c416b50598dd8da6e7099318ab4b31b6e3ab' into pyside6.0 
Change-Id: I3ca531ac8f6b72d6d2ad4e28522b3ef4ab8e8f80
 2021-03-26 14:12:14 +02:00
Qt Submodule Update Bot
b021c416b5 Update submodules on '6.0' in qt/qt5 
Change-Id: Ifff28ca8c055f02e19818be673b962aca7cdbf3f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.0.3 		2021-03-26 06:23:45 +02:00
Paul Wicking
55273d6cc0 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-25 18:19:14 +00:00
Qt Submodule Update Bot
7aa86c0924 Update submodules on '6.0' in qt/qt5 
Change-Id: Ic13adf9282cea81f8fd00187cf343bf33994243b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-24 07:18:34 +02:00
Qt Submodule Update Bot
ea624475d7 Update submodules on '6.0' in qt/qt5 
Change-Id: Ie4614881e3b92023f300cf9e82df6661226b93bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-23 13:29:01 +02:00
Qt Submodule Update Bot
64f08a4607 Update submodules on '6.0' in qt/qt5 
Change-Id: I192cca38ff1deb2fec4e7c5112f5f3427a2ffc42
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-23 03:01:20 +02:00
Qt Submodule Update Bot
e3ef111eae Update submodules on '6.0' in qt/qt5 
Change-Id: Id619a45a77efda40079bd172da5b92cfe24405f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-22 17:59:38 +02:00
Qt Submodule Update Bot
f97f0edc10 Update submodules on '6.0' in qt/qt5 
Change-Id: I6168a62d97c3ae1e2d4d1063e9f77a96e6ca1d9b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-22 07:30:06 +02:00
Qt Submodule Update Bot
9d021a4170 Update submodules on '6.0' in qt/qt5 
Change-Id: I0f9ae377b375e01767e0b5db1385d37a2ac7d239
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-19 06:32:23 +02:00
Qt Submodule Update Bot
e62979050c Update submodules on '6.0' in qt/qt5 
Change-Id: Id8442e10ef72de96201c1a1ff96b94ecf2e81988
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-18 11:28:41 +02:00
Qt Submodule Update Bot
282de9a961 Update submodules on '6.0' in qt/qt5 
Change-Id: I7d538c58d6b92474c0376b2db670c02c85243705
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-18 05:45:12 +02:00
Qt Submodule Update Bot
987453db68 Update submodules on '6.0' in qt/qt5 
Change-Id: Ica8e1b80990fc5765d1ab9539b1d2a5ea25780e6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-17 10:24:54 +02:00
Qt Submodule Update Bot
04ff839c76 Update submodules on '6.0' in qt/qt5 
Change-Id: I4fdbc53169d9e446f68a9afd01d38c77f7a72178
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-17 05:57:56 +02:00
Qt Submodule Update Bot
3bc11ef32e Update submodules on '6.0' in qt/qt5 
Change-Id: Ib60b526f1119abddc08db9eacb8a13bc67140aa0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-13 03:11:41 +02:00
Qt Submodule Update Bot
a44a53aba2 Update submodules on '6.0' in qt/qt5 
Change-Id: I5a0e81d1050911480176ea8c47d89d9f357f25d3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-12 17:10:03 +02:00
Paul Wicking
6797c35157 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: Edward Welbourne <edward.welbourne@qt.io>
 2021-03-12 09:19:12 +00:00
Qt Submodule Update Bot
9abdbccaf1 Update submodules on '6.0' in qt/qt5 
Change-Id: I3c96114fe38788172dec85558f0dca4d02bdeaf9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-12 09:35:33 +02:00
Qt Submodule Update Bot
e29bd4cb85 Update submodules on '6.0' in qt/qt5 
Change-Id: I3955d571bdc65cdf25ea8fad436a174e03d9698c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-12 04:41:58 +02:00
Qt Submodule Update Bot
38746546d8 Update submodules on '6.0' in qt/qt5 
Change-Id: I847ea44eb219d62db0c9995ce958db63d96caf9f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-03-12 00:07:20 +02:00