diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-08-06 13:36:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-08 16:53:04 +0200 |
| commit | 5373e3e821c7f43d9c941384437b1d39d6e9d47e (patch) | |
| tree | 5801d6582494867b536fb632cb6f00e0c654f24a /src | |
| parent | 23d2fa526bf215343c77971709a9d00535ce1ab7 (diff) | |
Enable configure tests for system libmng and libtiff
The current code didn't run the tests anymore, but was still
based on the assumption that qtbase/configure set up the
right configuration.
Clean up the pro files for mng and tiff while we're at it.
Change-Id: Iee46c183fda57ec07b60a80089af7925db959c40
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/imageformats/mng/mng.pro | 6 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/qtiffhandler.pri | 10 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/tiff.pro | 11 |
3 files changed, 12 insertions, 15 deletions
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index 435df20..17e364f 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro @@ -4,9 +4,9 @@ load(qt_plugin) HEADERS += qmnghandler_p.h SOURCES += qmnghandler.cpp OTHER_FILES += mng.json -contains(QT_CONFIG, system-mng) { - if(unix|win32-g++*):LIBS += -lmng - else:win32: LIBS += libmng.lib +config_libmng { + unix|win32-g++*: LIBS += -lmng + else:win32: LIBS += libmng.lib } else { include($$PWD/../../../3rdparty/libmng.pri) *-g++*: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter diff --git a/src/plugins/imageformats/tiff/qtiffhandler.pri b/src/plugins/imageformats/tiff/qtiffhandler.pri deleted file mode 100644 index dd23735..0000000 --- a/src/plugins/imageformats/tiff/qtiffhandler.pri +++ /dev/null @@ -1,10 +0,0 @@ -# common to plugin and built-in forms -INCLUDEPATH *= $$PWD -HEADERS += $$PWD/qtiffhandler_p.h -SOURCES += $$PWD/qtiffhandler.cpp -contains(QT_CONFIG, system-tiff) { - if(unix|win32-g++*):LIBS += -ltiff - else:win32: LIBS += libtiff.lib -} else { - include($$PWD/../../../3rdparty/libtiff.pri) -} diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index 88cca29..6d306b7 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -1,10 +1,17 @@ TARGET = qtiff load(qt_plugin) -include(qtiffhandler.pri) -SOURCES += main.cpp +HEADERS += qtiffhandler_p.h +SOURCES += main.cpp qtiffhandler.cpp OTHER_FILES += tiff.json +config_libtiff { + unix|win32-g++*: LIBS += -ltiff + else:win32: LIBS += libtiff.lib +} else { + include($$PWD/../../../3rdparty/libtiff.pri) +} + DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target |