diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-09 11:03:54 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-09 11:03:54 (GMT) |
| commit | 8bc84e2180e1d5819b372f4cd8c236b853145803 (patch) | |
| tree | 6c5e6a8b6a1750e2484fd34f48be662fcf51959f /src/plugins/imageformats | |
| parent | d641198fa71fadd243e84dfdf02b9a0536a27b3f (diff) | |
| parent | 3b1e30bb1d6651a626aba1f6b8883f5524598ed3 (diff) | |
| download | Qt-8bc84e2180e1d5819b372f4cd8c236b853145803.zip Qt-8bc84e2180e1d5819b372f4cd8c236b853145803.tar.gz Qt-8bc84e2180e1d5819b372f4cd8c236b853145803.tar.bz2 | |
Merge commit 'origin/master' into 4.6-merged
Conflicts:
src/corelib/kernel/qcoreevent.cpp
src/corelib/tools/qdumper.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkreplyimpl.cpp
src/sql/drivers/ibase/qsql_ibase.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/network-settings.h
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qobjectrace/tst_qobjectrace.cpp
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
tools/configure/configureapp.cpp
translations/qt_ru.ts
Diffstat (limited to 'src/plugins/imageformats')
| -rw-r--r-- | src/plugins/imageformats/jpeg/jpeg.pro | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/mng/mng.pro | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index e2e1a66..f8893a0 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -13,6 +13,10 @@ wince*: { contains(CE_ARCH,x86):CONFIG += exceptions_off } +symbian: { + QMAKE_CXXFLAGS.CW += -W nounusedarg +} + contains(QT_CONFIG, system-jpeg) { unix:LIBS += -ljpeg win32:LIBS += libjpeg.lib diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index 35cb47a..e391ebc 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro @@ -7,6 +7,10 @@ HEADERS += qmnghandler.h SOURCES += main.cpp \ qmnghandler.cpp +symbian: { + QMAKE_CXXFLAGS.CW += -W nounused +} + contains(QT_CONFIG, system-mng) { unix:LIBS += -lmng win32:LIBS += libmng.lib |