1 files changed, 10 insertions, 4 deletions
diff --git a/src/widgets/itemviews/qfileiconprovider.h b/src/widgets/itemviews/qfileiconprovider.h
index cac135fe71..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
@@ -59,19 +57,27 @@ public:
     QFileIconProvider();
     virtual ~QFileIconProvider();
     enum IconType { Computer, Desktop, Trashcan, Network, Drive, Folder, File };
+
+    enum Option {
+        DontUseCustomDirectoryIcons = 0x00000001
+    };
+    Q_DECLARE_FLAGS(Options, Option)
+
     virtual QIcon icon(IconType type) const;
     virtual QIcon icon(const QFileInfo &info) const;
     virtual QString type(const QFileInfo &info) const;
 
+    void setOptions(Options options);
+    Options options() const;
+
 private:
     Q_DECLARE_PRIVATE(QFileIconProvider)
     QScopedPointer<QFileIconProviderPrivate> d_ptr;
     Q_DISABLE_COPY(QFileIconProvider)
 };
 
-#endif // QT_NO_FILEICONPROVIDER
+Q_DECLARE_OPERATORS_FOR_FLAGS(QFileIconProvider::Options)
 
 QT_END_NAMESPACE
 
 #endif // QFILEICONPROVIDER_H
-