diff -r 5dc02b23752f -r 3e2da88830cd src/corelib/tools/tools.pri
--- a/src/corelib/tools/tools.pri	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/corelib/tools/tools.pri	Wed Aug 18 10:37:55 2010 +0300
@@ -89,26 +89,8 @@
 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) {
-   unix:LIBS_PRIVATE += -lz
-#  win32:LIBS += libz.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