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/corelib | |
| 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/corelib')
| -rw-r--r-- | src/corelib/tools/tools.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 4e0ebbc..e579dd5 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -106,8 +106,9 @@ contains(QT_CONFIG, zlib) { ../3rdparty/zlib/uncompr.c \ ../3rdparty/zlib/zutil.c } else:!contains(QT_CONFIG, no-zlib) { - unix:LIBS_PRIVATE += -lz -# win32:LIBS += libz.lib + symbian:LIBS_PRIVATE += -llibz + else:if(unix|win32-g++*):LIBS_PRIVATE += -lz + else:LIBS += zdll.lib } DEFINES += HB_EXPORT=Q_CORE_EXPORT |