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>

8 files changed, 16 insertions, 15 deletions

diff --git a/config.tests/unix/libmng/libmng.cpp b/config.tests/libmng/libmng.cpp
index d28bf60..d28bf60 100644
--- a/config.tests/unix/libmng/libmng.cpp
+++ b/config.tests/libmng/libmng.cpp
diff --git a/config.tests/unix/libmng/libmng.pro b/config.tests/libmng/libmng.pro
index ee57ecd..ee57ecd 100644
--- a/config.tests/unix/libmng/libmng.pro
+++ b/config.tests/libmng/libmng.pro
diff --git a/config.tests/unix/libtiff/libtiff.cpp b/config.tests/libtiff/libtiff.cpp
index 607def2..607def2 100644
--- a/config.tests/unix/libtiff/libtiff.cpp
+++ b/config.tests/libtiff/libtiff.cpp
diff --git a/config.tests/unix/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
index 60ba7d1..60ba7d1 100644
--- a/config.tests/unix/libtiff/libtiff.pro
+++ b/config.tests/libtiff/libtiff.pro
diff --git a/qtimageformats.pro b/qtimageformats.pro
index d60c8c7..61e52d2 100644
--- a/qtimageformats.pro
+++ b/qtimageformats.pro
@@ -1,3 +1,7 @@
+load(configure)
+qtCompileTest(libmng)
+qtCompileTest(libtiff)
+
 load(qt_parts)
 
 include(doc/doc.pri)
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