Consolidate zlib configuration redundancy

Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

6 files changed, 21 insertions, 64 deletions

diff --git a/src/3rdparty/zlib.pri b/src/3rdparty/zlib.pri
new file mode 100644
index 0000000000..bae322155d
--- /dev/null
+++ b/src/3rdparty/zlib.pri
@@ -0,0 +1,14 @@
+wince*: DEFINES += NO_ERRNO_H
+INCLUDEPATH += $$PWD/zlib
+SOURCES+= \
+    $$PWD/zlib/adler32.c \
+    $$PWD/zlib/compress.c \
+    $$PWD/zlib/crc32.c \
+    $$PWD/zlib/deflate.c \
+    $$PWD/zlib/gzio.c \
+    $$PWD/zlib/inffast.c \
+    $$PWD/zlib/inflate.c \
+    $$PWD/zlib/inftrees.c \
+    $$PWD/zlib/trees.c \
+    $$PWD/zlib/uncompr.c \
+    $$PWD/zlib/zutil.c
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index e579dd58e1..d81ab04c7e 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -89,27 +89,8 @@ else:unix:SOURCES += tools/qelapsedtimer_unix.cpp
 else:win32:SOURCES += tools/qelapsedtimer_win.cpp
 else:SOURCES += tools/qelapsedtimer_generic.cpp
 
-#zlib support
-contains(QT_CONFIG, zlib) {
-   wince*: DEFINES += NO_ERRNO_H
-   INCLUDEPATH += ../3rdparty/zlib
-   SOURCES+= \
-        ../3rdparty/zlib/adler32.c \
-        ../3rdparty/zlib/compress.c \
-        ../3rdparty/zlib/crc32.c \
-        ../3rdparty/zlib/deflate.c \
-        ../3rdparty/zlib/gzio.c \
-        ../3rdparty/zlib/inffast.c \
-        ../3rdparty/zlib/inflate.c \
-        ../3rdparty/zlib/inftrees.c \
-        ../3rdparty/zlib/trees.c \
-        ../3rdparty/zlib/uncompr.c \
-        ../3rdparty/zlib/zutil.c
-} else:!contains(QT_CONFIG, no-zlib) {
-    symbian:LIBS_PRIVATE += -llibz
-    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
-    else:LIBS += zdll.lib
-}
+contains(QT_CONFIG, zlib):include($$PWD/../../3rdparty/zlib.pri)
+else:include($$PWD/../../3rdparty/zlib_dependency.pri)
 
 DEFINES += HB_EXPORT=Q_CORE_EXPORT
 INCLUDEPATH += ../3rdparty/harfbuzz/src
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index a5cfb8400c..07aabc9651 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -402,11 +402,4 @@ neon:*-g++* {
     QMAKE_EXTRA_COMPILERS += neon_compiler
 }
 
-contains(QT_CONFIG, zlib) {
-    INCLUDEPATH += ../3rdparty/zlib
-} else:!contains(QT_CONFIG, no-zlib) {
-    symbian:LIBS_PRIVATE += -llibz
-    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
-    else:LIBS += zdll.lib
-}
-
+include($$PWD/../../3rdparty/zlib_dependency.pri)
diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index f7f6b5cdbe..6a0cd3286a 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -59,11 +59,4 @@ SOURCES += \
     access/qabstractnetworkcache.cpp \
     access/qnetworkdiskcache.cpp
 
-#zlib support
-contains(QT_CONFIG, zlib) {
-    INCLUDEPATH += ../3rdparty/zlib
-} else:!contains(QT_CONFIG, no-zlib) {
-    symbian:LIBS_PRIVATE += -llibz
-    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
-    else:LIBS += zdll.lib
-}
+include($$PWD/../../3rdparty/zlib_dependency.pri)
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index de4bba6ce0..7b5251afb9 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -42,11 +42,4 @@ INCLUDEPATH += ../3rdparty/harfbuzz/src
 
 symbian:TARGET.UID3=0x2001B2E2
 
-#zlib support
-contains(QT_CONFIG, zlib) {
-    INCLUDEPATH += ../3rdparty/zlib
-} else:!contains(QT_CONFIG, no-zlib) {
-    symbian:LIBS_PRIVATE += -llibz
-    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
-    else:LIBS += zdll.lib
-}
+include(../3rdparty/zlib_dependency.pri)
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 149291a3da..a74c9c19a5 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -95,25 +95,8 @@ macx: {
    LIBS += -framework CoreServices
 }
 
-contains(QT_CONFIG, zlib)|cross_compile {
-   INCLUDEPATH += ../../3rdparty/zlib
-   SOURCES+= \
-        ../3rdparty/zlib/adler32.c \
-        ../3rdparty/zlib/compress.c \
-        ../3rdparty/zlib/crc32.c \
-        ../3rdparty/zlib/deflate.c \
-        ../3rdparty/zlib/gzio.c \
-        ../3rdparty/zlib/inffast.c \
-        ../3rdparty/zlib/inflate.c \
-        ../3rdparty/zlib/inftrees.c \
-        ../3rdparty/zlib/trees.c \
-        ../3rdparty/zlib/uncompr.c \
-        ../3rdparty/zlib/zutil.c
-} else:!contains(QT_CONFIG, no-zlib) {
-    symbian:LIBS_PRIVATE += -llibz
-    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
-    else:LIBS += zdll.lib
-}
+if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
+else:include(../../3rdparty/zlib_dependency.pri)
 
 lib.CONFIG = dummy_install
 INSTALLS += lib