lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-07 04:46:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,425 Commits 120 Branches 272 Tags
efdd6f944b392d4fda1e984040744acd4fd5318e
Commit Graph

4425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heikki Halmet
9e834b7651 Provisioning: Update Xcode to 11.3 for macOS 10.14 
Task-number: QTQAINFRA-3189
Change-Id: If16062254b33579b14f141d1db4aca2ad1e23afb
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-01-04 19:48:32 +00:00
Liang Qi
f09dbf65e1 Enable a no-gui build on Ubuntu 18.04 for 5.14 
Task-number: QTQAINFRA-3406
Change-Id: Idb3e828f851fe00e76b0f3db1badb336062cd20a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-01-04 18:03:26 +01:00
Qt Submodule Update Bot
e6fd7bcd26 Update submodules on '5.14' in qt/qt5 
Change-Id: Ibbf7352f6dc6fd2ce5601c2d0be2811b5e84c101
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-04 15:31:26 +01:00
Assam Boudjelthia
51417379f7 Install QEMU from .deb package from internal cache 
QEMU cloning and building with each provisioning takes
time, thus installing it from a prebuilt installable package
can save lots of time in provisioning.

Task-number: QTQAINFRA-3396
Change-Id: I3e9b0fedeecb6ddbae3997742827552ce9419399
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-01-03 17:33:24 +02:00
Qt Submodule Update Bot
c926819387 Update submodules on '5.14' in qt/qt5 
Change-Id: Ic2c372266dcb55741918dfc756328aae9cc72008
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-01-03 10:50:14 +01:00
Qt Submodule Update Bot
cac62e47fe Update submodules on '5.15' in qt/qt5 
Change-Id: I8f0be41a7d699b881d77bade00e6668992253818
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-03 08:26:49 +01:00
Qt Submodule Update Bot
63f9bfd6f9 Update submodules on '5.14' in qt/qt5 
Change-Id: I483e96010677a18ac89577cb35f72d42e2544853
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-02 13:29:36 +01:00
Qt Submodule Update Bot
a626d59af1 Update submodules on '5.15' in qt/qt5 
Change-Id: I799197cc0d39360e2410005873330a73e9fbbe72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-01 23:45:59 +01:00
Qt Submodule Update Bot
1def8bb62c Update submodules on '5.15' in qt/qt5 
Change-Id: Iab73ab91d8e449f851dcf46cfd169632e9c244fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-29 23:45:59 +01:00
Qt Submodule Update Bot
60a556268c Update submodules on '5.14' in qt/qt5 
Change-Id: Id466f85a6e2f1e79ec35836be1ea7f9ca4216666
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-29 22:31:00 +01:00
Qt Submodule Update Bot
af7cf0fc3f Update submodules on '5.15' in qt/qt5 
Change-Id: Ie54bc40cf2b0fdbe80313a5c17eeca8129e9619d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-26 23:45:59 +01:00
Qt Submodule Update Bot
450e5f4d7c Update submodules on '5.14' in qt/qt5 
Change-Id: Ic3b07bb0ffca1ec66adc762238a61f613bb24ee0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-26 22:31:00 +01:00
Qt Submodule Update Bot
c48c756bb9 Update submodules on '5.15' in qt/qt5 
Change-Id: I53604693e5430dfc4f5bb56043bbe71df82d2c0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-22 23:45:59 +01:00
Qt Submodule Update Bot
02ee6e571f Update submodules on '5.14' in qt/qt5 
Change-Id: I835657ea69a413b2c08073cdf565140642987f70
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-22 22:31:00 +01:00
Qt Submodule Update Bot
db55667668 Update submodules on '5.14' in qt/qt5 
Change-Id: If43145e8009a9a6a278a57aebf3dff91a928c9c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-20 06:19:03 +01:00
Paul Wicking
bd0943bf50 Update _clang-format definition 
Add indentation for preprocessor directives if/ifdef/endif
as this is commonly used across Qt.

Change-Id: I0ce9851cc0861b8d18cb3717d695c871169db239
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2019-12-18 09:55:55 +01:00
Jani Heikkinen
62d75f883c Update enterprise license agreement v4.2.1 
Task-number: QTBUG-80661
Change-Id: Icc3a1408b104ad2f08cd6959ee4bcb8da2fb69cf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2019-12-18 07:20:13 +02:00
Qt Submodule Update Bot
812a8b0e1a Update submodules on '5.14' in qt/qt5 
Change-Id: I0cbcbc227db09a2d6fad6390d00ef95148edbcd7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-17 07:34:43 +01:00
Liang Qi
14174482be Update submodules on '5.15' in qt/qt5 
Change-Id: I9729f4621df730a8e62a5b8b8c8147b73e772f3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-12-16 11:02:38 +01:00
Qt Submodule Update Bot
96594fef87 Update submodules on '5.14' in qt/qt5 
Change-Id: I47e1f77b3953df5defdc14b7f200bdd0c46191c3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-15 22:31:17 +01:00
Qt Submodule Update Bot
f6e9fc2ba5 Update submodules on '5.14' in qt/qt5 
Change-Id: I0fbad0d790ea54f08bd71c8a558646e4c0711294
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-15 14:02:20 +01:00
Liang Qi
ee2798641b Merge remote-tracking branch 'origin/5.14.0' into 5.14 
Change-Id: I5c3bfd31d2489bcf1a44f694532afbe92b9d3074
 2019-12-14 20:58:11 +01:00
Qt Submodule Update Bot
86848c1298 Update submodules on '5.14' in qt/qt5 
Change-Id: I778e48468a05708269960018a3e70e45f7295149
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-14 13:13:09 +01:00
Simon Hausmann
68c8693e5b Merge remote-tracking branch 'origin/wip/cmake' into dev 
This merges merely the provisioning changes needed to perform cmake
builds in the CI. The platform configuration changes will be applied
incremental as we merge support in the individual modules.

 Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Added ninja to
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
just to force re-provisioning.

Removed module_config.yaml because that breaks license check in
qmake builds.

Change-Id: Ic074c0c881404f4361e61f66130c0cb07f5e8b84
 2019-12-13 14:58:08 +01:00
Alexandru Croitor
3aef268464 Update vcpkg snapshot 
The snapshot uses the previous snapshot as a based. It was rebased
on latest master as of 2019-12-05, and also contains cherry-picked
patches to target iOS.

Change-Id: I9fc0c39856fdb255533f6c71d27f5749894b6bea
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-12-11 20:58:03 +00:00
Qt Submodule Update Bot
bbe2ca1f14 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ia8dbab68e5a7dd4f136e6345d6c1da9705d4be69
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-12-11 02:31:30 +00:00
Tony Sarajärvi
11ded96d6e Remove SLES 12 provisioning scripts, as the platforms is already removed 
Change-Id: I52ded9be93b65b74ac4d42434f82a44831e3ec48
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-12-10 17:17:51 +00:00
Heikki Halmet
a7c5f204bc Provisioning: New Tier1 image for Windows 10 x86_64 
Change will upgrade Visual studios to the latest ones. Also MSVC 2019
build tools are installed for RTA.

MSVC 2019 version 16.3.10
MSVC 2017 version 15.9.17
MSVC 2019 build tools version 16.3.10

Task-number: QTQAINFRA-3389
Change-Id: Ic21645f96f8d4e6abc38951bd6bab519b4864418
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-12-10 09:48:42 +02:00
Qt Submodule Update Bot
d47213e974 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I8a50e284b785b7441826ed4f199a5db4c2be6f6e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-12-10 05:06:00 +00:00
Qt Submodule Update Bot
26ef6f7c13 Update submodules on '5.14.0' in qt5 
Change-Id: Ic2d754b6f873b051472b3fd9ff2b8e7ee27d7dfb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.14.0 v5.14.0-rc2 		2019-12-08 14:43:07 +00:00
Qt Submodule Update Bot
f38665a06a Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I0c29a5b3944a20d6652c0c8cb1199abae9683f93
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-12-07 21:58:23 +00:00
Jani Heikkinen
ad52452416 Update QT LICENSE AGREEMENT Agreement version 4.2 in qt5 root 
There seems to be own copy of QT LICENSE AGREEMENT in qt5 root as well.

That's why we need to update it to currently used version (4.2). At same
time let's remove version from file name to make update easier in the
future

Task-number: QTBUG-80485
Change-Id: I286390a0754dcba79927f4d74abaf06d761bedc1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2019-12-06 15:28:17 +02:00
Qt Submodule Update Bot
bd37983a8d Update submodules on '5.14.0' in qt5 
Change-Id: I814b6e4b94291414b1a8e227095d2742de175985
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-12-06 13:28:07 +00:00
Liang Qi
2d6f569ee9 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: Ia67f4be8c51a2bd0a8a03cb3857dfd57d7eea806
 2019-12-06 10:25:21 +01:00
Liang Qi
4282752c19 Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: If0f14c514b3c7ce7abf6b27221a26f921fef7f7f
 2019-12-05 14:47:57 +01:00
Dimitrios Apostolou
e4f9ac5607 Tag the docker images as "latest" 
We will use this tag in qtbase to refer to the image to run, because
with the current sha1tree() tag, every minor change in the docker images
requires synchronized changes between repositories.

Task-number: QTBUG-79867
Change-Id: If94eb6dd8b97526b589e58064837bc6554fed79c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2019-12-05 09:13:39 +01:00
Qt Submodule Update Bot
ec79fbe5ec Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I45dd7a0b0a93a35aa3f528617efeaa2859f9ce6e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-12-04 08:41:15 +00:00
Alexandru Croitor
8c94279a59 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Id725f04bc4753fc68a9bbb2762beb2c5f4eb9d84
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-12-03 16:48:34 +00:00
Heikki Halmet
7c1c98e123 Provisioning: Install libpoppler 
Poppler test requires this package

Task-number: QTQAINFRA-3253
Change-Id: Ifc0904ca020a8606b06a4032d5145fbf2f8063f1
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
 2019-12-03 17:51:21 +02:00
Qt Submodule Update Bot
d7a4a50e2d Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Ia5837cb7f71ea98b280b66998f7a3624750dde6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CMake Build Bot
 2019-12-03 05:52:31 +00:00
Qt Submodule Update Bot
b1de0fedcf Update submodules on '5.14.0' in qt5 
Change-Id: I8b4b971563492f853f802337af7489e2d6323362
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.14.0-rc1 		2019-12-03 05:14:56 +00:00
Liang Qi
4b6c05815a Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: I4dd840681bd84f7aeed58602b0c998c0e5807e10
 2019-12-02 10:27:23 +01:00
Qt Submodule Update Bot
b3da333101 Update submodules on '5.14' in qt/qt5 
Change-Id: I7a09d7b24e5feb97ec891f0a92d35b12dcebde91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-12-01 22:30:59 +01:00
Jani Heikkinen
827bdae8ef Update submodules on '5.14.0' in qt5 
Update submodules on '5.14.0' in qt5

Change-Id: Ifd79795cba5a9b58f7c89e35f75f6fc6a4e57950
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-12-01 09:21:01 +02:00
Qt Submodule Update Bot
096fd23eb8 Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: I0a261abad505b2f2724f0a15a10708b67129ffbf
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-29 17:43:05 +00:00
Liang Qi
bdaf92aa41 Correct branches for .gitmodules 
This amends eabc1ed5bd.

Change-Id: Ifbcf5dc593d25d210b652b72e5563fb8e1a1ec5f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-29 15:55:39 +00:00
Liang Qi
61ffa2778f Update submodules on 'wip/cmake' in qt/qt5 
Change-Id: Id0fb114e7d4e4bc66d8a51e91ebc8de166229fb6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-11-29 15:44:24 +00:00
Liang Qi
95c7b90309 Update CMake to version 3.16.0-rc4 
Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-11-29 10:00:50 +00:00
Liang Qi
63c515a6cb Merge remote-tracking branch 'origin/dev' into wip/cmake 
Also update the Windows config to use MSVC2019 instead of 2017
to circumvent the issue that vcpkg is building libraries with the
latest compiler it finds (MSVC 2019), but Qt is building with 2017.

 Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsaferenderer.yaml

Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
 2019-11-28 19:44:30 +01:00
Qt Submodule Update Bot
56ad797f42 Update submodules on '5.14' in qt/qt5 
Change-Id: Iaeaf6014ff94eef81ebba7db5ae3de5fa1c4cc2f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-11-27 06:34:45 +01:00