diff options
| author | aavit <qt-info@nokia.com> | 2010-02-15 13:37:34 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-15 13:37:34 (GMT) |
| commit | c77f37f8d9ed021c8a61f50a571b117588e9258f (patch) | |
| tree | c19c179b2fbf1534dedf6d08fed38f950cef8999 /src/gui/image | |
| parent | 8f9e4994350f5aff0ae9b3aaadd270c0d2358b17 (diff) | |
| download | Qt-c77f37f8d9ed021c8a61f50a571b117588e9258f.zip Qt-c77f37f8d9ed021c8a61f50a571b117588e9258f.tar.gz Qt-c77f37f8d9ed021c8a61f50a571b117588e9258f.tar.bz2 | |
Update license doc and .pri file for libpng 1.4.0
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/image.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index b67be55..8d75fdd 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -96,6 +96,7 @@ SOURCES += \ unix:LIBS_PRIVATE += -lpng win32:LIBS += libpng.lib } else { + DEFINES *= QT_USE_BUNDLED_LIBPNG !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib SOURCES += ../3rdparty/libpng/png.c \ @@ -112,8 +113,7 @@ SOURCES += \ ../3rdparty/libpng/pngwio.c \ ../3rdparty/libpng/pngwrite.c \ ../3rdparty/libpng/pngwtran.c \ - ../3rdparty/libpng/pngwutil.c \ - ../3rdparty/libpng/pnggccrd.c + ../3rdparty/libpng/pngwutil.c } } else { DEFINES *= QT_NO_IMAGEFORMAT_PNG |