diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-07-02 16:30:30 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-02 16:30:30 (GMT) |
| commit | d20dcfd98602a4505624e48a64aa58c54ef65852 (patch) | |
| tree | 0df0ce8d644380fba50cd129d076b05b1b90c56a /src/plugins | |
| parent | ce545fb8ab5e3bdff8e8481567d931cb7cfb4e5a (diff) | |
| download | Qt-d20dcfd98602a4505624e48a64aa58c54ef65852.zip Qt-d20dcfd98602a4505624e48a64aa58c54ef65852.tar.gz Qt-d20dcfd98602a4505624e48a64aa58c54ef65852.tar.bz2 | |
No explicit link to zlib/jpeg for system mng/tiff
For "system" mng or tiff, the shared library mechanism takes care
of loading zlib. For exotic cases like static system mng/tiff/zlib,
one should use configure's -l option. Trying to cover such cases
in project files leads to clutter which is at best harmless for other
cases.
Png already had this arrangement.
The same principle applies to jpeg which is a potential dependency
of tiff and mng. However, bundled tiff and mng are built without
jpeg. Shared system jpeg is loaded automatically if needed. Static
system jpeg can be handled with configure's -l option.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/imageformats/mng/mng.pro | 14 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/tiff.pro | 19 |
2 files changed, 14 insertions, 19 deletions
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index 158f41a..1f3ad53 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro @@ -40,14 +40,14 @@ contains(QT_CONFIG, system-mng) { ../../../3rdparty/libmng/libmng_trace.c \ ../../../3rdparty/libmng/libmng_write.c \ ../../../3rdparty/libmng/libmng_zlib.c -} -contains(QT_CONFIG, system-zlib) { - symbian:LIBS_PRIVATE += -llibz - else:if(unix|win32-g++*):LIBS_PRIVATE += -lz - else:LIBS += zdll.lib -} else { - INCLUDEPATH += ../../../3rdparty/zlib + contains(QT_CONFIG, system-zlib) { + symbian:LIBS_PRIVATE += -llibz + else:if(unix|win32-g++*):LIBS_PRIVATE += -lz + else:LIBS += zdll.lib + } else { + INCLUDEPATH += ../../../3rdparty/zlib + } } QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index 08e471c..49d635e 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -10,11 +10,6 @@ SOURCES += main.cpp \ contains(QT_CONFIG, system-tiff) { unix|win32-g++*:LIBS += -ltiff win32:!win32-g++*:LIBS += libtiff.lib - - contains(QT_CONFIG, system-jpeg) { - unix|win32-g++*:LIBS += -ljpeg - win32:!win32-g++*:LIBS += libjpeg.lib - } } else { INCLUDEPATH += ../../../3rdparty/libtiff/libtiff SOURCES += \ @@ -65,14 +60,14 @@ contains(QT_CONFIG, system-tiff) { symbian: { SOURCES += ../../../3rdparty/libtiff/port/lfind.c } -} -contains(QT_CONFIG, system-zlib) { - symbian:LIBS_PRIVATE += -llibz - else:if(unix|win32-g++*):LIBS_PRIVATE += -lz - else:LIBS += zdll.lib -} else { - INCLUDEPATH += ../../../3rdparty/zlib + contains(QT_CONFIG, system-zlib) { + symbian:LIBS_PRIVATE += -llibz + else:if(unix|win32-g++*):LIBS_PRIVATE += -lz + else:LIBS += zdll.lib + } else { + INCLUDEPATH += ../../../3rdparty/zlib + } } QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats |