From 647a72325680b7febfa9c70c8b4dd720004b968a Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Tue, 19 Jun 2012 09:25:42 +0300
Subject: [PATCH] Fix MNG imageformat plugin build.
Trying to build MNG image format plugin for WEC7 gives the error:
Cannot open include file: 'qmnghandler_p.h': No such file or directory
The correct INCLUDEPATH was already used in qmnghandler.pri, but it
wasn't included anywhere. Refactored mng.pro to use qmnghandler.pri
correspondingly as TIFF image format plugin uses qtiffhandler.pri
Change-Id: Ie96c898b27747da3a34465eda2c6a3b923ad22c6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: aavit <eirik.aavitsland@digia.com>
---
src/plugins/imageformats/mng/mng.pro | 13 ++-----------
src/plugins/imageformats/mng/qmnghandler.pri | 9 +++++----
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
index 9890c11f..f4e79afa 100644
--- a/src/plugins/imageformats/mng/mng.pro
+++ b/src/plugins/imageformats/mng/mng.pro
@@ -4,15 +4,6 @@ PLUGIN_TYPE = imageformats
PLUGIN_CLASS_NAME = QMngPlugin
load(qt_plugin)
-HEADERS += qmnghandler_p.h
-SOURCES += qmnghandler.cpp
-OTHER_FILES += mng.json
-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
-}
-
+include(qmnghandler.pri)
SOURCES += main.cpp
+OTHER_FILES += mng.json
diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri
index ffb98de9..cdf17c50 100644
--- a/src/plugins/imageformats/mng/qmnghandler.pri
+++ b/src/plugins/imageformats/mng/qmnghandler.pri
@@ -2,9 +2,10 @@
INCLUDEPATH *= $$PWD
HEADERS += $$PWD/qmnghandler_p.h
SOURCES += $$PWD/qmnghandler.cpp
-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)
+ include($$PWD/../../../3rdparty/libmng.pri)
+ *-g++*: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter
}
--
GitLab