diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-21 14:30:46 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-21 16:39:03 +0100 |
| commit | 3b281f66937a3a9329c7ff363b16499664c52b4e (patch) | |
| tree | 7fa36295cc37aa9378193d4df9c1834561450c04 /src/gui/image | |
| parent | a4ea58bf0498e02ddc30d4b8067dc22deb0255fd (diff) | |
QAbstractFileIconProvider: Fix compilation without feature mimetype
Change-Id: I3aecc1ab97ed549511bc9a5cbc8eb780f5e9a4dd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qabstractfileiconprovider.cpp | 11 | ||||
| -rw-r--r-- | src/gui/image/qabstractfileiconprovider_p.h | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/gui/image/qabstractfileiconprovider.cpp b/src/gui/image/qabstractfileiconprovider.cpp index dbf27d9360..d79e49832b 100644 --- a/src/gui/image/qabstractfileiconprovider.cpp +++ b/src/gui/image/qabstractfileiconprovider.cpp @@ -43,7 +43,9 @@ #include <private/qguiapplication_p.h> #include <qpa/qplatformtheme.h> #include <qicon.h> +#if QT_CONFIG(mimetype) #include <qmimedatabase.h> +#endif #include <private/qabstractfileiconprovider_p.h> @@ -151,7 +153,11 @@ QIcon QAbstractFileIconProviderPrivate::getIconThemeIcon(const QFileInfo &info) return getIconThemeIcon(QAbstractFileIconProvider::Drive); if (info.isDir()) return getIconThemeIcon(QAbstractFileIconProvider::Folder); +#if QT_CONFIG(mimetype) return QIcon::fromTheme(mimeDatabase.mimeTypeForFile(info).iconName()); +#else + return QIcon::fromTheme(QLatin1String("text-x-generic")); +#endif } /*! @@ -267,8 +273,13 @@ QString QAbstractFileIconProvider::type(const QFileInfo &info) const if (QFileSystemEntry::isRootPath(info.absoluteFilePath())) return QGuiApplication::translate("QAbstractFileIconProvider", "Drive"); if (info.isFile()) { +#if QT_CONFIG(mimetype) const QMimeType mimeType = d->mimeDatabase.mimeTypeForFile(info); return mimeType.comment().isEmpty() ? mimeType.name() : mimeType.comment(); +#else + Q_UNUSED(d); + return QGuiApplication::translate("QAbstractFileIconProvider", "File"); +#endif } if (info.isDir()) diff --git a/src/gui/image/qabstractfileiconprovider_p.h b/src/gui/image/qabstractfileiconprovider_p.h index 37646f77e6..c6193fe48a 100644 --- a/src/gui/image/qabstractfileiconprovider_p.h +++ b/src/gui/image/qabstractfileiconprovider_p.h @@ -52,7 +52,9 @@ // #include <QtGui/private/qtguiglobal_p.h> +#if QT_CONFIG(mimetype) #include <QtCore/QMimeDatabase> +#endif #include "qabstractfileiconprovider.h" QT_BEGIN_NAMESPACE @@ -75,7 +77,9 @@ public: QAbstractFileIconProvider *q_ptr = nullptr; QAbstractFileIconProvider::Options options = {}; +#if QT_CONFIG(mimetype) QMimeDatabase mimeDatabase; +#endif }; QT_END_NAMESPACE |