diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-22 01:05:17 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-22 01:05:17 (GMT) |
| commit | 0109df3ee449767c1836ec7028ac219c57cf9ca7 (patch) | |
| tree | 5fdc90fd34ac4e49ba05bef47a86427e4df71917 /src/gui/image/image.pri | |
| parent | 46e84339a9eaf1587528c20a4c9e05bc1b549afd (diff) | |
| parent | 0a83a6c571fadb454cb8711aed84258b061d44b5 (diff) | |
| download | Qt-0109df3ee449767c1836ec7028ac219c57cf9ca7.zip Qt-0109df3ee449767c1836ec7028ac219c57cf9ca7.tar.gz Qt-0109df3ee449767c1836ec7028ac219c57cf9ca7.tar.bz2 | |
Merge remote branch 'origin/master' into bearermanagement/unit-tests
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
Diffstat (limited to 'src/gui/image/image.pri')
| -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 |