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/3rdparty/libpng.pri | |
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/3rdparty/libpng.pri')
-rw-r--r-- | src/3rdparty/libpng.pri | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/3rdparty/libpng.pri b/src/3rdparty/libpng.pri index 7ac1910..81966cb 100644 --- a/src/3rdparty/libpng.pri +++ b/src/3rdparty/libpng.pri @@ -1,20 +1,7 @@ DEFINES *= QT_USE_BUNDLED_LIBPNG !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE INCLUDEPATH += $$PWD/libpng -SOURCES += $$PWD/libpng/png.c \ - $$PWD/libpng/pngerror.c \ - $$PWD/libpng/pngget.c \ - $$PWD/libpng/pngmem.c \ - $$PWD/libpng/pngpread.c \ - $$PWD/libpng/pngread.c \ - $$PWD/libpng/pngrio.c \ - $$PWD/libpng/pngrtran.c \ - $$PWD/libpng/pngrutil.c \ - $$PWD/libpng/pngset.c \ - $$PWD/libpng/pngtrans.c \ - $$PWD/libpng/pngwio.c \ - $$PWD/libpng/pngwrite.c \ - $$PWD/libpng/pngwtran.c \ - $$PWD/libpng/pngwutil.c + +SOURCES += $$PWD/libpng/privatepng.cpp include($$PWD/zlib_dependency.pri) |