diff options
| author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-23 18:45:45 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 19:06:18 +0100 |
| commit | 755cd58f9c70eba0c67da8b2b504fd7a07a2c4e2 (patch) | |
| tree | a082837a32f9ba476102c65f3768cd15a593c666 /src/3rdparty/libjpeg.pri | |
| parent | 41a5ca35591a735d9f07e2335d5827763d52c1f4 (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/libjpeg.pri')
| -rw-r--r-- | src/3rdparty/libjpeg.pri | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri index 63f2aca5dc..5896a53942 100644 --- a/src/3rdparty/libjpeg.pri +++ b/src/3rdparty/libjpeg.pri @@ -5,10 +5,7 @@ wince*: { } #Disable warnings in 3rdparty code due to unused arguments -symbian: { - QMAKE_CXXFLAGS.CW += -W nounusedarg - TARGET.UID3=0x2001E61B -} else:contains(QMAKE_CC, gcc): { +contains(QMAKE_CC, gcc): { QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main } |