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/3rdparty/zlib/inffast.h | |
| 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/3rdparty/zlib/inffast.h')
| -rw-r--r-- | src/3rdparty/zlib/inffast.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/3rdparty/zlib/inffast.h b/src/3rdparty/zlib/inffast.h deleted file mode 100644 index e5c1aa4..0000000 --- a/src/3rdparty/zlib/inffast.h +++ /dev/null @@ -1,11 +0,0 @@ -/* inffast.h -- header to use inffast.c - * Copyright (C) 1995-2003, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); |