summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/tools.pri
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/tools/tools.pri')
-rw-r--r--src/corelib/tools/tools.pri11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index f23968d504..62eaf5a3bb 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -109,8 +109,15 @@ else:win32:SOURCES += tools/qelapsedtimer_win.cpp tools/qlocale_win.cpp
else:integrity:SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp
else:SOURCES += tools/qelapsedtimer_generic.cpp
-contains(QT_CONFIG, zlib):include($$PWD/../../3rdparty/zlib.pri)
-else:include($$PWD/../../3rdparty/zlib_dependency.pri)
+contains(QT_CONFIG, zlib) {
+ include($$PWD/../../3rdparty/zlib.pri)
+ corelib_zlib_headers.files = $$PWD/../../3rdparty/zlib/zconf.h\
+ $$PWD/../../3rdparty/zlib/zlib.h
+ corelib_zlib_headers.path = $$[QT_INSTALL_HEADERS]/QtZlib
+ INSTALLS += corelib_zlib_headers
+} else {
+ include($$PWD/../../3rdparty/zlib_dependency.pri)
+}
contains(QT_CONFIG,icu) {
SOURCES += tools/qlocale_icu.cpp