From e9e7dca9dad1ce0a9a5f9b579db1f209b96695c4 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 17 Jan 2014 14:38:08 +0100 Subject: Replace win32-g++ with mingw scope Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: I90c319bdda6b710bce4d2d883736716a70760127 Reviewed-by: Friedemann Kleint --- src/3rdparty/zlib_dependency.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/zlib_dependency.pri') diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index fc05522..74efbbb 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -1,7 +1,7 @@ # zlib dependency satisfied by bundled 3rd party zlib or system zlib contains(QT_CONFIG, system-zlib) { - if(unix|win32-g++*): LIBS_PRIVATE += -lz - else: LIBS += zdll.lib + unix|mingw: LIBS_PRIVATE += -lz + else: LIBS += zdll.lib } else { load(qt_build_paths) git_build: \ -- cgit v1.2.3