Commit 5373e3e8 authored by Lars Knoll's avatar Lars Knoll Committed by Qt by Nokia
Browse files

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: default avatarOswald Buddenhagen <oswald.buddenhagen@nokia.com>
parent 23d2fa52
No related merge requests found
Showing with 16 additions and 15 deletions
File moved
File moved
File moved
File moved
load(configure)
qtCompileTest(libmng)
qtCompileTest(libtiff)
load(qt_parts)
include(doc/doc.pri)
......@@ -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
......
# 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)
}
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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment