summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-01-17 14:38:08 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-07 13:53:57 +0100
commite9e7dca9dad1ce0a9a5f9b579db1f209b96695c4 (patch)
tree7d01bb3ecadc026cef99489355e60716c59a0b67 /src/3rdparty
parenta416082d7b2d28813ff3855a61945ba109af522d (diff)
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 <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/zlib_dependency.pri4
1 files changed, 2 insertions, 2 deletions
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: \