Commit 647a7232 authored by Janne Anttila's avatar Janne Anttila Committed by The Qt Project
Browse files

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: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: default avatarJohannes Oikarinen <johannes.oikarinen@digia.com>
Reviewed-by: default avatarAndreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: default avataraavit <eirik.aavitsland@digia.com>
parent 847c2ebc
dev 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 old/5.1 old/5.2 stable wip/cmake v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1 v5.1.0-beta1
No related merge requests found
Showing with 7 additions and 15 deletions
...@@ -4,15 +4,6 @@ PLUGIN_TYPE = imageformats ...@@ -4,15 +4,6 @@ PLUGIN_TYPE = imageformats
PLUGIN_CLASS_NAME = QMngPlugin PLUGIN_CLASS_NAME = QMngPlugin
load(qt_plugin) load(qt_plugin)
HEADERS += qmnghandler_p.h include(qmnghandler.pri)
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
}
SOURCES += main.cpp SOURCES += main.cpp
OTHER_FILES += mng.json
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
INCLUDEPATH *= $$PWD INCLUDEPATH *= $$PWD
HEADERS += $$PWD/qmnghandler_p.h HEADERS += $$PWD/qmnghandler_p.h
SOURCES += $$PWD/qmnghandler.cpp SOURCES += $$PWD/qmnghandler.cpp
contains(QT_CONFIG, system-mng) { config_libmng {
if(unix|win32-g++*):LIBS += -lmng unix|win32-g++*: LIBS += -lmng
else:win32: LIBS += libmng.lib else:win32: LIBS += libmng.lib
} else { } else {
include($$PWD/../../3rdparty/libmng.pri) include($$PWD/../../../3rdparty/libmng.pri)
*-g++*: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter
} }
Supports Markdown
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