diff options
| author | Constantin Makshin <cmakshin@gmail.com> | 2010-06-10 14:38:46 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-10 14:38:46 (GMT) |
| commit | 9385f050620f14e3c3e4616906cf1999bf166041 (patch) | |
| tree | 85f4c2c3ca0246d25ea638dfa251d8fdbbfc5b3f | |
| parent | f7f4cd37c9e649ed62d2d95a6dbb71d631391b53 (diff) | |
| download | Qt-9385f050620f14e3c3e4616906cf1999bf166041.zip Qt-9385f050620f14e3c3e4616906cf1999bf166041.tar.gz Qt-9385f050620f14e3c3e4616906cf1999bf166041.tar.bz2 | |
Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else"
Merge-request: 2411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/plugins/imageformats/jpeg/jpeg.pro | 3 | ||||
| -rw-r--r-- | src/plugins/imageformats/mng/mng.pro | 3 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/tiff.pro | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index e28c5fb..0b5d389 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -24,8 +24,7 @@ symbian: { contains(QT_CONFIG, system-jpeg) { unix|win32-g++*:LIBS += -ljpeg win32:!win32-g++*:LIBS += libjpeg.lib -} -!contains(QT_CONFIG, system-jpeg) { +} else { INCLUDEPATH += ../../../3rdparty/libjpeg SOURCES += \ ../../../3rdparty/libjpeg/jaricom.c \ diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index f23a5ef..c188b47 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro @@ -16,8 +16,7 @@ symbian: { contains(QT_CONFIG, system-mng) { unix|win32-g++*:LIBS += -lmng win32:!win32-g++*:LIBS += libmng.lib -} -!contains(QT_CONFIG, system-mng) { +} else { DEFINES += MNG_BUILD_SO DEFINES += MNG_NO_INCLUDE_JNG INCLUDEPATH += ../../../3rdparty/libmng diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index 3bf203c..90868e8 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -15,8 +15,7 @@ contains(QT_CONFIG, system-tiff) { unix|win32-g++*:LIBS += -ljpeg win32:!win32-g++*:LIBS += libjpeg.lib } -} -!contains(QT_CONFIG, system-tiff) { +} else { INCLUDEPATH += ../../../3rdparty/libtiff/libtiff SOURCES += \ ../../../3rdparty/libtiff/libtiff/tif_aux.c \ |