diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-03-17 10:53:20 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-03-21 08:05:56 +0100 |
| commit | 58f832445889d7745fba22f7ca9489b209df7151 (patch) | |
| tree | 229e7e46542baff4895e176629c7456995f13ddc /coin/platform_configs/default.yaml | |
| parent | 79e164fc720cf0682ecfbf46a157841dccfef7db (diff) | |
Do not pass -qt-zlib to cross-builds
Commit 89fceff6a4d added -qt-zlib to all Windows configure lines.
This also affected QNX. Instead, only pass -qt-zlib to native builds.
Fixes: QTBUG-82254
Change-Id: I116cae82ab971170e633b5a8602dd573407be96f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'coin/platform_configs/default.yaml')
| -rw-r--r-- | coin/platform_configs/default.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1206bf14..91a5fde8 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -33,14 +33,14 @@ Configurations: Target arch: 'x86' Compiler: 'MSVC2015' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 -qt-zlib' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015' - Template: 'qtci-windows-10-x86_64-16' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qt-zlib' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015' - Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2017' |