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

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

Browse Source 
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
This commit is contained in:
Liang Qi
2019-11-27 09:23:05 +01:00
committed by Alexandru Croitor
parent 3ba8bdeda0 0d6ae070f4
commit 63c515a6cb
34 changed files with 400 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/default.yaml
View File

@@ -13,8 +13,8 @@ Configurations:
Compiler: 'Clang'
Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12'
-
Template: 'qtci-windows-10-x86_64-14'
Compiler: 'MSVC2017'
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'MSVC2019'
Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'