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>

2 files changed, 11 insertions, 11 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'
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index 89adc43e..8bbef9d8 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -3,14 +3,14 @@
     Target os: 'WinRT_10'
     Compiler: 'MSVC2015'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
 -
     Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     Target arch: 'x86'
     Compiler: 'MSVC2017'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017'
 -
     Template: 'qtci-windows-7-x86-3'
     Compiler: 'Mingw73'
@@ -27,13 +27,13 @@
     Target arch: 'armv7'
     Compiler: 'MSVC2017'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017'
 -
     Template: 'qtci-windows-10-x86_64-16'
     Target os: 'WinRT_10'
     Compiler: 'MSVC2017'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017'
 -
     Template: 'qtci-windows-10-x86_64-16'
     Target os: 'Android_ANY'
@@ -41,7 +41,7 @@
     Compiler: 'Mingw73'
     Target compiler: 'Clang'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20'
 -
     Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'Android_ANY'
@@ -63,21 +63,21 @@
     Target arch: 'armv7'
     Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc'
 -
     Template: 'qtci-windows-10-x86_64-16'
     Target os: 'QNX_700'
     Target arch: 'armv8'
     Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc'
 -
     Template: 'qtci-windows-10-x86_64-16'
     Target os: 'QNX_700'
     Target arch: 'x86_64'
     Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc'
 -
     Template: 'qtci-linux-RHEL-7.6-x86_64'
     Target os: 'QNX_700'
@@ -97,7 +97,7 @@
     Target os: 'WebAssembly'
     Compiler: 'Mingw73'
     Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten -qt-zlib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten'
 -
     Template: 'qtci-macos-10.13-x86_64-2'
     Target os: 'WebAssembly'