diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-10 13:23:11 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-11 12:08:06 +0200 |
| commit | 947802bea35f853483b3a3ccaf0f6f2df2568fdf (patch) | |
| tree | dbd16066b3994698546be8072e5147cfea5e33d8 | |
| parent | 2c0816aa9927b0b9a80f23945f8516306f7329c6 (diff) | |
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 33e8275ee5bda554ab18dd349219262299bf1e9a.
Task-number: QTBUG-84233
Change-Id: I1e4ca39717768303eca8435d175aa562fcd6f0f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | coin/platform_configs/qtqa.yaml | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 4cdf0115..ac4fa05f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ depends = qtbase path = qtqa url = ../qtqa.git - branch = master + branch = dev status = essential priority = 50 [submodule "qtlocation"] diff --git a/coin/platform_configs/qtqa.yaml b/coin/platform_configs/qtqa.yaml new file mode 100644 index 00000000..3ca0b38b --- /dev/null +++ b/coin/platform_configs/qtqa.yaml @@ -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}}'] |