From b50d20b7057fcd808525921e56d25f75140c79cd Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 22 Jan 2016 14:20:11 +0100 Subject: Fix building with unusual options When building without image format plugins we shouldn't even try to build the svg image format plugin. Otherwise it will fail to load later. Then icon engine plugin, however, can easily be built even without image formats. Furthermore, the network example needs bearer management. Change-Id: I1380e5b2de7d112283ef0fb65a01a5049412af55 Reviewed-by: Friedemann Kleint Reviewed-by: aavit --- examples/svg/network/network.pro | 3 ++- src/plugins/iconengines/svgiconengine/main.cpp | 4 ---- src/plugins/imageformats/svg/main.cpp | 2 +- src/plugins/plugins.pro | 5 ++++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/svg/network/network.pro b/examples/svg/network/network.pro index cd3cc86..0b87d29 100644 --- a/examples/svg/network/network.pro +++ b/examples/svg/network/network.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs -qtHaveModule(widgets): SUBDIRS += bearercloud +load(qfeatures) +qtHaveModule(widgets):!contains(QT_DISABLED_FEATURES, bearermanagement): SUBDIRS += bearercloud diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp index eb86627..ebcdc82 100644 --- a/src/plugins/iconengines/svgiconengine/main.cpp +++ b/src/plugins/iconengines/svgiconengine/main.cpp @@ -40,8 +40,6 @@ #include #include -#if !defined(QT_NO_IMAGEFORMATPLUGIN) - #include "qsvgiconengine.h" #include @@ -80,5 +78,3 @@ QIconEngine *QSvgIconPlugin::create(const QString &file) QT_END_NAMESPACE #include "main.moc" - -#endif // !QT_NO_IMAGEFORMATPLUGIN diff --git a/src/plugins/imageformats/svg/main.cpp b/src/plugins/imageformats/svg/main.cpp index 97c8a34..f18c1b4 100644 --- a/src/plugins/imageformats/svg/main.cpp +++ b/src/plugins/imageformats/svg/main.cpp @@ -40,7 +40,7 @@ #include #include -#if !defined(QT_NO_IMAGEFORMATPLUGIN) && !defined(QT_NO_SVGRENDERER) +#if !defined(QT_NO_SVGRENDERER) #include "qsvgiohandler.h" diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 1d714d4..3965957 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,2 +1,5 @@ TEMPLATE = subdirs -SUBDIRS += iconengines imageformats + +load(qfeatures) +!contains(QT_DISABLED_FEATURES, imageformatplugin): SUBDIRS += imageformats +SUBDIRS += iconengines -- cgit v1.2.1