diff options
| author | Constantin Makshin <cmakshin@gmail.com> | 2010-06-10 14:38:42 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-10 14:38:42 (GMT) |
| commit | 66539b167c01968f3040bfad9a59561a8b253639 (patch) | |
| tree | 67a688b641fecf7a9a3acafe3f6dc594425aa39e /src/gui/image/image.pri | |
| parent | 2d8a4862d09e2d77c0c3ed0f297c3d27b179db08 (diff) | |
| download | Qt-66539b167c01968f3040bfad9a59561a8b253639.zip Qt-66539b167c01968f3040bfad9a59561a8b253639.tar.gz Qt-66539b167c01968f3040bfad9a59561a8b253639.tar.bz2 | |
Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms.
Improved support of "-system-jpeg" "-system-mng" "-system-png" and "-system-tiff" configuration options on Windows (thanks to Mark Brand <mabrand@mabrand.nl>)
Merge-request: 2411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/gui/image/image.pri')
| -rw-r--r-- | src/gui/image/image.pri | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index 8d75fdd..c4eac95 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -93,12 +93,12 @@ SOURCES += \ SOURCES += image/qpnghandler.cpp contains(QT_CONFIG, system-png) { - unix:LIBS_PRIVATE += -lpng - win32:LIBS += libpng.lib + unix|win32-g++*:LIBS_PRIVATE += -lpng + win32:!win32-g++*: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 + INCLUDEPATH += ../3rdparty/libpng SOURCES += ../3rdparty/libpng/png.c \ ../3rdparty/libpng/pngerror.c \ ../3rdparty/libpng/pngget.c \ @@ -114,6 +114,14 @@ SOURCES += \ ../3rdparty/libpng/pngwrite.c \ ../3rdparty/libpng/pngwtran.c \ ../3rdparty/libpng/pngwutil.c + + contains(QT_CONFIG, system-zlib) { + symbian:LIBS_PRIVATE += -llibz + else:if(unix|win32-g++*):LIBS_PRIVATE += -lz + else:LIBS += zdll.lib + } else { + INCLUDEPATH += ../3rdparty/zlib + } } } else { DEFINES *= QT_NO_IMAGEFORMAT_PNG |