summaryrefslogtreecommitdiffstats
path: root/src/gui/image/image.pri
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-07-02 16:30:31 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-02 16:30:31 (GMT)
commit51ba8332385f3abceae88ec0a7ae29ac1e875a5c (patch)
tree930c27ea6f4194bf9bc8429bfad3a5687b2653f8 /src/gui/image/image.pri
parentd20dcfd98602a4505624e48a64aa58c54ef65852 (diff)
downloadQt-51ba8332385f3abceae88ec0a7ae29ac1e875a5c.zip
Qt-51ba8332385f3abceae88ec0a7ae29ac1e875a5c.tar.gz
Qt-51ba8332385f3abceae88ec0a7ae29ac1e875a5c.tar.bz2
Split image handler plugin project files
One pri for each handler, e.g. src/gui/image/qjpeghandler.pri. One pri for each 3rd party package, e.g src/3rdparty/libjpeg.pri. One shared pri for zlib dependency of 3rd party packages. This was really about image handler plugins, but PNG got the same treatment for consistency's sake. Also, moved image handler source files from plugins to src/gui/image so they are with the other image handlers. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/gui/image/image.pri')
-rw-r--r--src/gui/image/image.pri44
1 files changed, 6 insertions, 38 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index f1b02b0..9f0c87e 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -85,42 +85,10 @@ SOURCES += \
image/qxbmhandler.cpp \
image/qxpmhandler.cpp
-# 3rd party / system PNG support
-!contains(QT_CONFIG, no-png) {
- HEADERS += image/qpnghandler_p.h
- SOURCES += image/qpnghandler.cpp
+!contains(QT_CONFIG, no-png):include($$PWD/qpnghandler.pri)
+else:DEFINES *= QT_NO_IMAGEFORMAT_PNG
- contains(QT_CONFIG, system-png) {
- unix|win32-g++*:LIBS_PRIVATE += -lpng
- win32:!win32-g++*:LIBS += libpng.lib
- } else {
- DEFINES *= QT_USE_BUNDLED_LIBPNG
- !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE
- INCLUDEPATH += ../3rdparty/libpng
- SOURCES += ../3rdparty/libpng/png.c \
- ../3rdparty/libpng/pngerror.c \
- ../3rdparty/libpng/pngget.c \
- ../3rdparty/libpng/pngmem.c \
- ../3rdparty/libpng/pngpread.c \
- ../3rdparty/libpng/pngread.c \
- ../3rdparty/libpng/pngrio.c \
- ../3rdparty/libpng/pngrtran.c \
- ../3rdparty/libpng/pngrutil.c \
- ../3rdparty/libpng/pngset.c \
- ../3rdparty/libpng/pngtrans.c \
- ../3rdparty/libpng/pngwio.c \
- ../3rdparty/libpng/pngwrite.c \
- ../3rdparty/libpng/pngwtran.c \
- ../3rdparty/libpng/pngwutil.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
- }
- }
-} else {
- DEFINES *= QT_NO_IMAGEFORMAT_PNG
-}
+contains(QT_CONFIG, jpeg):include($$PWD/qjpeghandler.pri)
+contains(QT_CONFIG, mng):include($$PWD/qmnghandler.pri)
+contains(QT_CONFIG, tiff):include($$PWD/qtiffhandler.pri)
+contains(QT_CONFIG, gif):include($$PWD/qgifhandler.pri)