diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-20 14:07:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-20 14:10:00 +0200 |
| commit | 9a8fb868ec2c526325408a4cbf3e628aa3377e30 (patch) | |
| tree | c5f319b851ce3c76664cd27133bfb874f265abd7 /coin/platform_configs/qtsaferenderer.yaml | |
| parent | c63dd0ddfdf1467e2f08cb1c9769142be1420ca5 (diff) | |
| parent | 42366fd7405f778d3b80f9de2f593ff18f52e0f9 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
This reverts commit d494d76c26df48c9cf3b45fc15ebad963fe34c52.
Conflicts:
coin/platform_configs/default.yaml
Temporarily remove the -no-opengl build.
coin/platform_configs/meta-boot2qt.yaml
coin/platform_configs/qt5.yaml
Temporarily remove the webassembly build on windows.
coin/platform_configs/qtwebkit.yaml
Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
Diffstat (limited to 'coin/platform_configs/qtsaferenderer.yaml')
| -rw-r--r-- | coin/platform_configs/qtsaferenderer.yaml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml new file mode 100644 index 00000000..cc0c29d7 --- /dev/null +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -0,0 +1,13 @@ +- + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'Mingw73' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' +- + Template: 'qtci-windows-10-x86_64-14' + Compiler: 'Mingw73' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker' |