From 2af7e73f7e0335d28bb3de7c985a7305aba36a5e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 25 Oct 2013 21:14:24 +0200
Subject: remove pointless #ifndef QT_NO_SVG

the way to disable the feature is to not compile the module.

Change-Id: I96f18d037243f7d6e3b3cb2c23922cc4c05c30a8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 src/plugins/iconengines/svgiconengine/main.cpp         | 2 +-
 src/plugins/iconengines/svgiconengine/qsvgiconengine.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/plugins/iconengines/svgiconengine')

diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp
index 2fd9d57..c16cf95 100644
--- a/src/plugins/iconengines/svgiconengine/main.cpp
+++ b/src/plugins/iconengines/svgiconengine/main.cpp
@@ -42,7 +42,7 @@
 #include <qiconengineplugin.h>
 #include <qstringlist.h>
 
-#if !defined(QT_NO_IMAGEFORMATPLUGIN) && !defined(QT_NO_SVG)
+#if !defined(QT_NO_IMAGEFORMATPLUGIN)
 
 #include "qsvgiconengine.h"
 
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
index 8f9a1c3..ebf5314 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
@@ -45,8 +45,6 @@
 #include <QtGui/qiconengine.h>
 #include <QtCore/qshareddata.h>
 
-#ifndef QT_NO_SVG
-
 QT_BEGIN_NAMESPACE
 
 class QSvgIconEnginePrivate;
@@ -80,5 +78,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SVG
 #endif
-- 
cgit v1.2.1