summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2016-01-22 14:20:11 +0100
committerUlf Hermann <ulf.hermann@theqtcompany.com>2016-02-08 10:40:46 +0000
commitb50d20b7057fcd808525921e56d25f75140c79cd (patch)
tree4837223f6baa59cd8c3887baf145eb4cbde81fda
parent816b0d34b7345e21a7c732c9dfb0d93903df25d7 (diff)
downloadqtsvg-b50d20b7057fcd808525921e56d25f75140c79cd.tar.gz
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 <Friedemann.Kleint@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
-rw-r--r--examples/svg/network/network.pro3
-rw-r--r--src/plugins/iconengines/svgiconengine/main.cpp4
-rw-r--r--src/plugins/imageformats/svg/main.cpp2
-rw-r--r--src/plugins/plugins.pro5
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 <qiconengineplugin.h>
#include <qstringlist.h>
-#if !defined(QT_NO_IMAGEFORMATPLUGIN)
-
#include "qsvgiconengine.h"
#include <qiodevice.h>
@@ -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 <qimageiohandler.h>
#include <qstringlist.h>
-#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