From 95fe97dbcb4a4ce81b80eaf7c45a1106dd860271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Martins?= <sergio.martins@kdab.com>
Date: Thu, 2 May 2013 16:24:28 +0100
Subject: [PATCH] Remove QT_NO_FILEICONPROVIDER ifdefs

FILEICONPROVIDER isn't listed in qfeatures.txt and Qt doesn't
build without it.

If you need QT_NO_FILEICONPROVIDER, besides reverting this commit,
you'll need to add a good amount of ifdefs to QFileDialog,
QFileSystemModel and QFileInfoGatherer classes.

Change-Id: Ic288c90268f6a900e160ba8eb4457580d1fd7a5a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
---
 src/widgets/itemviews/qfileiconprovider.cpp | 3 ---
 src/widgets/itemviews/qfileiconprovider.h   | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp
index f03d9fb81b..0763cbbd87 100644
--- a/src/widgets/itemviews/qfileiconprovider.cpp
+++ b/src/widgets/itemviews/qfileiconprovider.cpp
@@ -41,7 +41,6 @@
 
 #include "qfileiconprovider.h"
 
-#ifndef QT_NO_FILEICONPROVIDER
 #include <qstyle.h>
 #include <qapplication.h>
 #include <qdir.h>
@@ -428,5 +427,3 @@ QString QFileIconProvider::type(const QFileInfo &info) const
 }
 
 QT_END_NAMESPACE
-
-#endif
diff --git a/src/widgets/itemviews/qfileiconprovider.h b/src/widgets/itemviews/qfileiconprovider.h
index ed270619ed..6f7e28395b 100644
--- a/src/widgets/itemviews/qfileiconprovider.h
+++ b/src/widgets/itemviews/qfileiconprovider.h
@@ -49,8 +49,6 @@
 QT_BEGIN_NAMESPACE
 
 
-#ifndef QT_NO_FILEICONPROVIDER
-
 class QFileIconProviderPrivate;
 
 class Q_WIDGETS_EXPORT QFileIconProvider
@@ -78,11 +76,8 @@ private:
     Q_DISABLE_COPY(QFileIconProvider)
 };
 
-#endif // QT_NO_FILEICONPROVIDER
-
 Q_DECLARE_OPERATORS_FOR_FLAGS(QFileIconProvider::Options)
 
 QT_END_NAMESPACE
 
 #endif // QFILEICONPROVIDER_H
-