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>
This commit is contained in:
Sérgio Martins 2013-05-02 16:24:28 +01:00 committed by The Qt Project
parent 6dfba7c628
commit 95fe97dbcb
2 changed files with 0 additions and 8 deletions

View File

@ -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

View File

@ -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