diff options
| author | aavit <eirik.aavitsland@digia.com> | 2012-11-26 15:23:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-28 16:21:57 +0100 |
| commit | ca35995c1b46f1ede83cbaf64c3351336de7c4f2 (patch) | |
| tree | 68cdd9cb5cac10940f17c8a231deba088669b511 /src | |
| parent | d7ab351cddbebc8bd4fbd20b056158fcd8401d55 (diff) | |
Provide the bundled zlib headers for external access
(Currently, the Qt5 windows packages lack the tiff and mng plugins
from qtimageformats because of this issue.)
If Qt is configured to use its bundled zlib, it is compiled into
QtCore, and the public symbols are exported so that it can be used
by other Qt libraries. However, after modularization, this did not
work for libraries outside qtbase, since they did not have access
to the headers of the bundled zlib.
This commit fixes that.
Ref. also 1f461ac45bfa8887261510a95fb33a346d68eaba
Change-Id: Ie986f47e00fd0c16f2ba04d27f4258a20d61b260
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/tools.pri | 11 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 1 |
2 files changed, 10 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 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 1f630e3f68..f2f041b704 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -160,6 +160,7 @@ QMAKE_EXTRA_TARGETS += freeze_target mod_component_base = $$dirname(_QMAKE_CACHE_) QMAKE_SYNCQT += -minimal -module QtCore -module QtDBus -module QtXml \ -mkspecsdir $$[QT_HOST_DATA/get]/mkspecs -outdir $$mod_component_base $$dirname(_QMAKE_CONF_) + contains(QT_CONFIG, zlib):QMAKE_SYNCQT += -module QtZlib !silent:message($$QMAKE_SYNCQT) system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT") } |