diff options
| author | Romain Pokrzywka <romain@kdab.com> | 2010-08-16 09:37:39 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-09-21 18:22:55 (GMT) |
| commit | b588e0cbef6b7343307cf38d676d4471f2123cdc (patch) | |
| tree | 6fd4aa70f688018c6119e2dbd1a590f83f0a7b41 | |
| parent | cc28790dcdc1e519c4a097ba8d91ec7b19b14b54 (diff) | |
| download | Qt-b588e0cbef6b7343307cf38d676d4471f2123cdc.zip Qt-b588e0cbef6b7343307cf38d676d4471f2123cdc.tar.gz Qt-b588e0cbef6b7343307cf38d676d4471f2123cdc.tar.bz2 | |
fix qt static build on wince
Reviewed-by: mariusso
| -rw-r--r-- | src/3rdparty/libjpeg.pri | 15 | ||||
| -rw-r--r-- | src/plugins/imageformats/jpeg/jpeg.pro | 14 |
2 files changed, 15 insertions, 14 deletions
diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri index 4551d7b..63f2aca 100644 --- a/src/3rdparty/libjpeg.pri +++ b/src/3rdparty/libjpeg.pri @@ -1,3 +1,18 @@ +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 +} + + INCLUDEPATH += $$PWD/libjpeg SOURCES += \ $$PWD/libjpeg/jaricom.c \ 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 |