summaryrefslogtreecommitdiffstats
path: root/src/winmain
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/winmain
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/winmain')
-rw-r--r--src/winmain/winmain.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
index efee3cd..0c9b214 100644
--- a/src/winmain/winmain.pro
+++ b/src/winmain/winmain.pro
@@ -11,7 +11,7 @@ win32 {
win32-g++*:DEFINES += QT_NEEDS_QMAIN
win32-borland:DEFINES += QT_NEEDS_QMAIN
SOURCES = qtmain_win.cpp
- CONFIG += png zlib
+ CONFIG += png
CONFIG -= jpeg
INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore
}