diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-18 15:38:01 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-03 14:15:33 +0100 |
| commit | 25e007372082105c198d686d3130e22aaf9dc7fd (patch) | |
| tree | a20ced461f7cd779f5d96ff7813476803d619f24 /coin/platform_configs/qtsaferenderer.yaml | |
| parent | 486139715b2e5f45e69b324740cec0b0b3f2dfe7 (diff) | |
| download | qt5-25e007372082105c198d686d3130e22aaf9dc7fd.tar.gz | |
Use legacy instructions when building all qmake configurations
This change is preparation for merging qtbase wip/cmake -> dev,
because that will bring in the new yaml instructions on how
to build the CMake configurations, which means that legacy
instructions provided by Coin itself need to be used for all
the existing qmake configurations.
Change-Id: I7005835719b83b7186138292a2e1baf4d2a4a3e0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'coin/platform_configs/qtsaferenderer.yaml')
| -rw-r--r-- | coin/platform_configs/qtsaferenderer.yaml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index be14923b..63b2d0d3 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -2,13 +2,14 @@ Template: 'qtci-windows-10-x86_64-15' 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++' + Features: ['UseLegacyInstructions'] - Template: 'qtci-windows-10-x86_64-15' Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' |