summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/zlib_dependency.pri
diff options
context:
space:
mode:
authorXizhi Zhu <xizhi.zhu@gmail.com>2012-01-23 18:45:45 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-01 19:06:18 +0100
commit755cd58f9c70eba0c67da8b2b504fd7a07a2c4e2 (patch)
treea082837a32f9ba476102c65f3768cd15a593c666 /src/3rdparty/zlib_dependency.pri
parent41a5ca35591a735d9f07e2335d5827763d52c1f4 (diff)
Remove Symbian specific code in 3rdparty.
Symbian specific code in libtiff was added by commit 6ddf09085f1e8a3cc83c4ee0c77c433d26819c35 in Qt4, code in libpng was added by commit 66fb4038649cfd1d660204bf7c70f99a409ede4f in Qt4, so they are removed. Symbian specific code in freetype was copied from upstream, so kept untouched. Change-Id: I74f169d9283eefd91ec2e97cbd1b8f03dc449380 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/3rdparty/zlib_dependency.pri')
-rw-r--r--src/3rdparty/zlib_dependency.pri5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri
index 042eb1373f..75dd2396f2 100644
--- a/src/3rdparty/zlib_dependency.pri
+++ b/src/3rdparty/zlib_dependency.pri
@@ -1,8 +1,7 @@
# zlib dependency satisfied by bundled 3rd party zlib or system zlib
contains(QT_CONFIG, system-zlib) {
- symbian: LIBS_PRIVATE += -llibz
- else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
- else: LIBS += zdll.lib
+ if(unix|win32-g++*):LIBS_PRIVATE += -lz
+ else: LIBS += zdll.lib
} else {
INCLUDEPATH += $$PWD/zlib
}