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

Merge remote-tracking branch 'origin/5.15' into dev

Browse Source 
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtwebkit.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
This commit is contained in:
Liang Qi
2020-04-30 17:24:22 +02:00
parent ff4a1141f2 5f03b84e65
commit 54c94ae681
95 changed files with 1605 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/qtquick3d.yaml
View File

@@ -5,7 +5,7 @@ Configurations:
Compiler: 'GCC'
Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
Template: 'qtci-linux-openSUSE-15.1-x86_64'
Compiler: 'GCC'
Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-