lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wip/cmake' into dev

Browse Source 
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
This commit is contained in:
Simon Hausmann
2019-12-12 16:15:53 +01:00
committed by Alexandru Croitor
parent 2d6f569ee9 3aef268464
commit 68c8693e5b
21 changed files with 216 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/common/shared/vcpkg_version.txt Normal file
View File

@@ -0,0 +1 @@
vcpkg_version=qt-snapshot-2019-12-05