diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 05:20:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 05:20:47 (GMT) |
| commit | 60c195a1865e06026b54a5d8fd0036aaa010b8bc (patch) | |
| tree | efc90717e8107f06d6eda5e3d864d64eb2e43c0e /src/plugins | |
| parent | 80c2e1211065f606c6f39e708a74afad1c624663 (diff) | |
| parent | 44ac0a7ff72c94e7b417da18766ad1578b97b4b0 (diff) | |
| download | Qt-60c195a1865e06026b54a5d8fd0036aaa010b8bc.zip Qt-60c195a1865e06026b54a5d8fd0036aaa010b8bc.tar.gz Qt-60c195a1865e06026b54a5d8fd0036aaa010b8bc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
apply msvc flags to wince too
fix qt static build on wince
fix build with QT_NO_GESTURES
qmake: fix quoting of moc calls
Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar
Regenerate the Unicode tables after updates to the generator tool
Compile in C++0x mode
remove extra includes
minor clean-ups
minor improvements for data parsers
tiny clean-up for generated data
move QUnicodeTables:: script() and lineBreakClass() implementations
make lupdate test less fragile
Enable building Qt/Webkit with debug symbols
Add breakpad support
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/imageformats/jpeg/jpeg.pro | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index c5671c3..fb254b8 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -3,20 +3,6 @@ include(../../qpluginbase.pri) QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)" -wince*: { - DEFINES += NO_GETENV - contains(CE_ARCH,x86):CONFIG -= stl exceptions - contains(CE_ARCH,x86):CONFIG += exceptions_off -} - -#Disable warnings in 3rdparty code due to unused arguments -symbian: { - QMAKE_CXXFLAGS.CW += -W nounusedarg - TARGET.UID3=0x2001E61B -} else:contains(QMAKE_CC, gcc): { - QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main -} - include(../../../gui/image/qjpeghandler.pri) SOURCES += main.cpp |