lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-07 23:46:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,568 Commits 117 Branches 268 Tags
pyside6.0
Commit Graph

4568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Forward Merge Bot
7de03b2b01 Merge branch 6.0 into pyside6.0 
Change-Id: Ifb28b3fc83d2ad468999a72de06091c738e83be5
 2021-05-05 11:15:08 +00:00
Qt Submodule Update Bot
c7adb0b508 Update submodules on '6.0' in qt/qt5 
Change-Id: I2d09c695220431e107eb4b5828eb95879064336b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-05 09:08:36 +03:00
Qt Submodule Update Bot
49381e460a Update submodules on '6.0' in qt/qt5 
Change-Id: I0ca1403b574167da7e4e6a7894eb7632ac1258bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-04 19:34:47 +03:00
Qt Forward Merge Bot
36b7d80b28 Merge branch 6.0 into pyside6.0 
Change-Id: I0753c97ec2d0bfb0073204627daffde02aaac4ee
 2021-05-04 11:15:04 +00:00
Qt Submodule Update Bot
27e8406f30 Update submodules on '6.0' in qt/qt5 
Change-Id: I3fc17ce6ae53e6d68b010ddc389a9e4f1edf33c5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-05-04 07:14:39 +03:00
Qt Forward Merge Bot
eb25e0b28c Merge branch 6.0 into pyside6.0 
Change-Id: I13f8fd60958bbe26d4aa40ebf44771d799412534
 2021-05-03 11:15:21 +00:00
Heikki Halmet
306b5e224b Provisioning: Upgrade OpenSSL version to 1.1.1k 
Change-Id: I539d6da1953a40190fbfc8ff80f8e8332d797b1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 0e9f489192)
 2021-05-03 08:51:04 +03:00
Heikki Halmet
7c5313a0d7 Provisioning: Move GCC toolset script under right platform folder 
Change-Id: I93ba0f12c4377d77d5336b01089ed3bcf95e2c64
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-05-03 08:51:02 +03:00
Qt Forward Merge Bot
2056c2a87c Merge branch 6.0 into pyside6.0 
Change-Id: I87f75e6ca71775b4d1fa779e804921dc932b2f80
 2021-04-30 11:15:25 +00:00
Simo Fält
9e385191b1 Merge commit '415527935e4605f44239165c0018ce9b8ca14970' into pyside6.0 
Change-Id: I17ebe2f4c1e04dde7401c0a8a0afeac1dcd93915
 2021-04-29 13:32:33 +03:00
Qt Submodule Update Bot
413b4a7c3c Update submodules on '6.0' in qt/qt5 
Change-Id: I9be268d0f046428a345d103fd2775030e87aa83e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-29 07:19:06 +03:00
Qt Submodule Update Bot
838d1d887d Update submodules on '6.0' in qt/qt5 
Change-Id: I2fa6c689d8c8f87045866c8f1fed7c9648c0acec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-29 00:31:35 +03:00
Heikki Halmet
97aa262db5 Provisioning: Upgrade python 3.6 version to 3.6.2 
typing.NoReturn is not included in python 3.6.1 version. We need at
least 3.6.2 version

Task-number: QTQAINFRA-4433
Change-Id: I040e72e253852c7789d4f9e781d18e6b9a431a50
Reviewed-by: Dan Ackers <dan.ackers@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 6ae5052d57)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-28 17:39:50 +00:00
Jani Heikkinen
415527935e Update submodules on '6.0' in qt/qt5 
Change-Id: I85163695eed447c18874258cee8af30f470f2074
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v6.0.4 		2021-04-28 15:41:30 +03:00
Qt Submodule Update Bot
9b14586f74 Update submodules on '6.0' in qt/qt5 
Change-Id: I988a9b2ce4fc8408bcc6198e72471204f333cfc9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-28 12:19:15 +03:00
Qt Submodule Update Bot
12231ac87d Update submodules on '6.0' in qt/qt5 
Change-Id: I393aed1a45daa885060e6083c568cc3d2e4d2fca
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-28 07:37:40 +03:00
Qt Submodule Update Bot
cfad08fae4 Update submodules on '6.0' in qt/qt5 
Change-Id: I2a30449ee6e772de8a7544eb29a4546ba79a3e33
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-28 02:36:34 +03:00
Heikki Halmet
290d61626b Provisioning: Fix nodejs installation 
Task-number: QTBUG-93178
Change-Id: I27f4b1aa6f382cb6c9cc97f960fe1d0b81e47fbd
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 9e0334389b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-27 13:18:29 +00:00
Qt Submodule Update Bot
9d7a85efa0 Update submodules on '6.0' in qt/qt5 
Change-Id: Iec6a626ec7c35e7192c94dc8481c1ed25f9f31fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-27 11:38:20 +03:00
Heikki Halmet
3706f2de71 Remove InsingificantTests flag from openSUSE 15.1 developer build 
Task-number: QTQAINFRA-4430
Change-Id: I64b418a5318a6981c8b3cbf47a785bce11dc8c62
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-04-27 09:31:31 +03:00
Qt Submodule Update Bot
023944b2d3 Update submodules on '6.0' in qt/qt5 
Change-Id: I0dd63a2f06c55f3523c1b8780e8a7703aaad9631
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-27 06:45:11 +03:00
Heikki Halmet
42a240cb9e Provisioning: Fix gcc toolset source path 
Change-Id: I4e81894648c25ce629914bc4bd9ffa65681ad004
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 2d47450e69)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-26 12:56:07 +00:00
Qt Forward Merge Bot
5a8d37b64d Merge branch 6.0 into pyside6.0 
Change-Id: I46f93bf7dcd4edf7a7aa31217bac2da938f3aea7
 2021-04-26 11:15:09 +00:00
Qt Submodule Update Bot
d88b644c40 Update submodules on '6.0' in qt/qt5 
Change-Id: Ib51a09b2f7a005a2c3417e2254c5fcf45d80b441
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-26 13:24:31 +03:00
Samuli Piippo
015c698775 Disable QEMU testing 
Remove testing from 6.0, QEMU platforms have been marked insignificant
and have several failing cases. QEMU tests have been fixed in 6.1 and
marked significant there.

Task-number: QTBUG-86238
Change-Id: I8e20b1abbf3a115cfb3a5ee9f0480d220dbfa5cb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2021-04-26 07:25:05 +02:00
Qt Submodule Update Bot
3c7ffbabdf Update submodules on '6.0' in qt/qt5 
Change-Id: I00e3b0c20b17951bbf8abb504ed22f20f15d184b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-26 07:05:02 +03:00
Qt Forward Merge Bot
74566931f2 Merge branch 6.0 into pyside6.0 
Change-Id: I1930802f775e9aff07c21d8e0e92c948b42e1e4d
 2021-04-23 11:15:28 +00:00
Qt Forward Merge Bot
116d16c18e Merge branch 6.0 into pyside6.0 
Change-Id: I05fa6f532707188361192e94ac3b60f6392e6d94
 2021-04-22 11:16:13 +00:00
Heikki Halmet
8e3d30b05f Provisioning: Remove mac certificates and signing tools 
Those will be provided by Coin

Change-Id: Id38b99b11d8b7988d743fc8a302760c3286087ff
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 4e09a6db79)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-22 08:39:20 +00:00
Qt Submodule Update Bot
2658c06d6d Update submodules on '6.0' in qt/qt5 
Change-Id: Ifcbc679e1fb807086e899ac7fabe65790e737a84
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-22 09:31:29 +03:00
Qt Submodule Update Bot
2679542ace Update submodules on '6.0' in qt/qt5 
Change-Id: Ibbf36132d18a38a37b0777ffaa0350f74553bc9a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-22 04:47:13 +03:00
Johanna Äijälä
aee07f92f1 Provisioning: Fix Squish for Qt6 on macOS 
Add correct Squish package to the 'squish_for_qt6' location.

Change-Id: Ib997092a5d6350d9b7298d7cc8baf5a2afaca702
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 03821e82a5)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-04-21 09:01:27 +03:00
Qt Submodule Update Bot
3ca11e2a81 Update submodules on '6.0' in qt/qt5 
Change-Id: I2529007ab237613b90c2a42a3d21ead1fdc0869c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-04-21 06:45:08 +03:00
Qt Forward Merge Bot
62943cabe5 Merge branch 6.0 into pyside6.0 
Change-Id: Ie7b0506342e8ca8f6359178a0be21e76ceffd9e8
 2021-04-20 11:15:08 +00:00
Heikki Halmet
227482aa79 Provisioning: Resize ulimit value for open files 
Linker for Qt Webengine builds needs to open multiple files.
Without this it will hit the limit

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>
(cherry picked from commit a4b61379ca)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-20 06:11:55 +00:00
Heikki Halmet
99e6f0c480 Provisioning: Upgrade MSVC 2019 version to 16.9.4 
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>
(cherry picked from commit 9200ee7384)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-04-20 04:25:33 +00:00
Qt Forward Merge Bot
2ebb9d3e3f Merge branch 6.0 into pyside6.0 
Change-Id: I6d6b88ee79ae62674378d8b1d404b2636b873a2c
 2021-04-18 11:15:02 +00:00
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