diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-22 14:20:11 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-02-08 10:40:46 +0000 |
| commit | b50d20b7057fcd808525921e56d25f75140c79cd (patch) | |
| tree | 4837223f6baa59cd8c3887baf145eb4cbde81fda /src/plugins | |
| parent | 816b0d34b7345e21a7c732c9dfb0d93903df25d7 (diff) | |
| download | qtsvg-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>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/iconengines/svgiconengine/main.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/svg/main.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 5 |
3 files changed, 5 insertions, 6 deletions
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 |