diff options
| author | Debao Zhang <hello@debao.me> | 2012-12-07 17:42:38 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 12:37:07 +0100 |
| commit | 910b9e64a95ed89ff4a6f18cecdeb38ba2a00a2c (patch) | |
| tree | 837f0aea81fc48d184fe1175a859bbfb1cdb2eea /src/svg/svg.pro | |
| parent | 9d6ed74b505ab559d3635fd4a2f78835c581e5cd (diff) | |
| download | qtsvg-910b9e64a95ed89ff4a6f18cecdeb38ba2a00a2c.tar.gz | |
Use the bundled zlib in QtCore, if present.
src/3rdparty/zip is used for windows to build QtSvg under normal
builds. See sha: 6cdba02f6c4fc8c6baab7e03e0a2bedcb9a2d334
But QtCore has provided the bundled zlib headers for external access and
exported its public symbols when Qt is configured under normal builds
on windows
So there is no need to keep a seperate 3rdparty/zip copy any more.
Change-Id: Idf9cbce4c28a929f6dc6f7b25e22b28c1165fb55
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Diffstat (limited to 'src/svg/svg.pro')
| -rw-r--r-- | src/svg/svg.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro index 8dd73c0..0949849 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -48,5 +48,5 @@ contains(QT_CONFIG, system-zlib) { if(unix|win32-g++*): LIBS_PRIVATE += -lz else: LIBS += zdll.lib } else { - include(../3rdparty/zlib.pri) + INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib } |