Hide png symbols in a namespace for -qt-libpng
authorDaniel Teske <daniel.teske@nokia.com>
Tue, 22 Nov 2011 17:59:31 +0000 (18:59 +0100)
committerhjk <qthjk@ovi.com>
Tue, 22 Nov 2011 18:04:12 +0000 (19:04 +0100)
commit6b6397f91125ddfc2abdea9704bbed08beb22ab7
treee05bb038067bc065bb01e954208fc09637504c39
parent81ae9027b72dcf3635d2fb9f20e63d60b35d62e8
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>
24 files changed:
src/3rdparty/libpng.pri
src/3rdparty/libpng/png.c
src/3rdparty/libpng/png.h
src/3rdparty/libpng/pngconf.h
src/3rdparty/libpng/pngerror.c
src/3rdparty/libpng/pngget.c
src/3rdparty/libpng/pnginfo.h
src/3rdparty/libpng/pngmem.c
src/3rdparty/libpng/pngpread.c
src/3rdparty/libpng/pngpriv.h
src/3rdparty/libpng/pngread.c
src/3rdparty/libpng/pngrio.c
src/3rdparty/libpng/pngrtran.c
src/3rdparty/libpng/pngrutil.c
src/3rdparty/libpng/pngset.c
src/3rdparty/libpng/pngstruct.h
src/3rdparty/libpng/pngtest.c
src/3rdparty/libpng/pngtrans.c
src/3rdparty/libpng/pngwio.c
src/3rdparty/libpng/pngwrite.c
src/3rdparty/libpng/pngwtran.c
src/3rdparty/libpng/pngwutil.c
src/3rdparty/libpng/privatepng.cpp [new file with mode: 0644]
src/gui/image/qpnghandler.cpp