lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-04 15:36:24 +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
Dimitrios Apostolou
fe4a724a3e Use internal mirror repositories for Ubuntu docker containers 
Depending on different external URLs makes our provisioning scripts flaky,
because they can fail if any one of the external servers goes down.
In this patch

* the docker images qt_ubuntu_16.04 and qt_ubuntu_18.04 are being built first,
  they apt-get from the internal ubuntu mirror

* all the existing docker images have been rebased to these two images, so
  they inherit this behavior

* images that fetch files from the internet have been modified to not do the
  fetching themselves; insted URLs are fetched in advance using "DownloadURL"
  which accepts internal mirrored URLs, and the downloaded files are ADDed to
  the images with a local copy

* previously existing git clone commands have been modified to fetch
  internally mirrored tarballs

Task-number: QTQAINFRA-3343
Change-Id: Ic4640a4f7776e38623edba90f0eba7cb68631223
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-01-13 19:44:45 +01:00
Dimitrios Apostolou
302b228c7a Do not try to double-install docker-ce-cli 
That happened because docker-ce* was installing both docker-ce and
docker-ce-cli, so apt was printing a warning.

Change-Id: I0cad82243c8c3d5c0b9f26fc7b24673268259aa4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2020-01-13 19:44:45 +01:00
Qt Submodule Update Bot
14ad9b1387 Update submodules on '5.14' in qt/qt5 
Change-Id: Idb52a57c9c72c1424629a9ae2ed06584b5b8d068
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-13 06:39:07 +01:00
Qt Submodule Update Bot
cfa998544d Update submodules on '5.15' in qt/qt5 
Change-Id: I5a22e3929eaefa4efe1cbfc3eed10954bc32e2c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-12 23:46:00 +01:00
Qt Submodule Update Bot
ee690d1533 Update submodules on '5.14' in qt/qt5 
Change-Id: Id5f66e3cb581fd880851fb61d901060a8232be2e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-11 22:31:18 +01:00
Qt Submodule Update Bot
4a0e64744f Update submodules on '5.15' in qt/qt5 
Change-Id: I5def23e806a8193bb20c4444c8c4a800bbbdbf0c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-11 11:13:58 +01:00
Qt Submodule Update Bot
b0b93acc7d Update submodules on '5.14' in qt/qt5 
Change-Id: I5b18577a73d6c807ef3dd6a849e849594d016ffa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-11 10:56:54 +01:00
Qt Submodule Update Bot
59a9940d94 Update submodules on '5.14' in qt/qt5 
Change-Id: Ieac8e850bd8a6692a6ae71af6ad6160d6b7a5cd5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-10 15:06:10 +01:00
Dimitrios Apostolou
4d7f6c711c Remove unused script 
Change-Id: Ic3c57966c78fd8158a2467956fd31eaa4374412d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-01-10 16:06:07 +02:00
Qt Submodule Update Bot
a9633efe67 Update submodules on '5.15' in qt/qt5 
Change-Id: I9965f7277a859698cbbc70f66f1a352cab63436a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-10 09:37:04 +01:00
Qt Submodule Update Bot
fd9e7634de Update submodules on '5.14' in qt/qt5 
Change-Id: I4bd71f764c88db41229a068753b59255905f4381
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-09 07:26:18 +01:00
Kari Oikarinen
a0c08969b0 Adjust submodule branches 2020-01-08 17:57:47 +02:00
Qt Submodule Update Bot
eb425b3dff Update submodules on '5.14' in qt/qt5 
Change-Id: Ia736aeb90faaee12600944d54376db1876809bc0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-07 10:44:31 +01:00
Tony Sarajärvi
7286bd9f7a Remove WatchOS and tvOS from the CI 
Task-number: QTQAINFRA-3430
Change-Id: I3e6696db80312cbc14373ad623291e58017c6083
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
 2020-01-06 10:47:44 +00:00
Qt Submodule Update Bot
b272190213 Update submodules on '5.14' in qt/qt5 
Change-Id: I58a16e8a9ff1d1ca307c22ce012a6a9e088ef09f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-06 10:12:47 +01:00
Qt Submodule Update Bot
2dc0539847 Update submodules on '5.15' in qt/qt5 
Change-Id: I44e262601d39cabe1a29858d3fada7e8115a1df4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-06 09:01:05 +01:00
Qt Submodule Update Bot
3ae7991090 Update submodules on '5.15' in qt/qt5 
Change-Id: I64956bc9216b5afe7f85f74267492e9c549acb4a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-01-04 23:45:59 +01:00
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