summaryrefslogtreecommitdiffstats
path: root/src/qbase.pri
diff options
context:
space:
mode:
authorConstantin Makshin <cmakshin@gmail.com>2010-06-10 14:38:42 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-10 14:38:42 (GMT)
commit66539b167c01968f3040bfad9a59561a8b253639 (patch)
tree67a688b641fecf7a9a3acafe3f6dc594425aa39e /src/qbase.pri
parent2d8a4862d09e2d77c0c3ed0f297c3d27b179db08 (diff)
downloadQt-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/qbase.pri')
-rw-r--r--src/qbase.pri1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qbase.pri b/src/qbase.pri
index 83ae069..064e67c 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -85,7 +85,6 @@ win32-borland {
}
win32 {
- CONFIG += zlib
INCLUDEPATH += tmp
!static: DEFINES+=QT_MAKEDLL
}