qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "CMake: Enable CMake builds for qtqa"" 

There's a new dev branch for qtqa, so we can re-enable CMake builds
of qtqa using that branch, without breaking builds of other branches.

This reverts commit 33e8275ee5.

Task-number: QTBUG-84233
Change-Id: I1e4ca39717768303eca8435d175aa562fcd6f0f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-06-10 13:23:11 +02:00
parent 2c0816aa99
commit 947802bea3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -68,7 +68,7 @@
depends = qtbase depends = qtbase
path = qtqa path = qtqa
url = ../qtqa.git url = ../qtqa.git
branch = master branch = dev
status = essential status = essential
priority = 50 priority = 50
[submodule "qtlocation"] [submodule "qtlocation"]

7
coin/platform_configs/qtqa.yaml Normal file
View File

@ -0,0 +1,7 @@
Version: 2
Configurations:
-
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw'
Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF'
Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}']