diff options
| author | Daniel Teske <daniel.teske@nokia.com> | 2011-11-22 17:59:31 (GMT) |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2011-11-22 18:04:12 (GMT) |
| commit | 6b6397f91125ddfc2abdea9704bbed08beb22ab7 (patch) | |
| tree | e05bb038067bc065bb01e954208fc09637504c39 /src/gui/image | |
| parent | 81ae9027b72dcf3635d2fb9f20e63d60b35d62e8 (diff) | |
| download | Qt-6b6397f91125ddfc2abdea9704bbed08beb22ab7.zip Qt-6b6397f91125ddfc2abdea9704bbed08beb22ab7.tar.gz Qt-6b6397f91125ddfc2abdea9704bbed08beb22ab7.tar.bz2 | |
Hide png symbols in a namespace for -qt-libpng
If qt is compiled with -qt-libpng then the png symbols
prevent a loading of another libpng. With this patch
the png symbols are hidden and thus it is possible
to load another libpng.
Reviewed-by: hjk <qtc-committer@nokia.com>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpnghandler.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index 1714442..5a4a4d7 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -53,6 +53,7 @@ #ifdef QT_USE_BUNDLED_LIBPNG #include <../../3rdparty/libpng/png.h> #include <../../3rdparty/libpng/pngconf.h> +using namespace PrivatePng; #else #include <png.h> #include <pngconf.h> |