1 files changed, 26 insertions, 12 deletions
diff --git a/src/gui/image/qabstractfileiconprovider.cpp b/src/gui/image/qabstractfileiconprovider.cpp
index c5a51001af..78777ec115 100644
--- a/src/gui/image/qabstractfileiconprovider.cpp
+++ b/src/gui/image/qabstractfileiconprovider.cpp
@@ -39,6 +39,12 @@ QIcon QAbstractFileIconProviderPrivate::getPlatformThemeIcon(QAbstractFileIconPr
     if (theme == nullptr)
         return {};
 
+    if (theme->themeHint(QPlatformTheme::PreferFileIconFromTheme).toBool()) {
+        const QIcon result = getIconThemeIcon(type);
+        if (!result.isNull())
+            return result;
+    }
+
     auto &cache = *iconTypeCache();
     auto it = cache.find(type);
     if (it == cache.end()) {
@@ -108,8 +114,14 @@ static inline QPlatformTheme::IconOptions toThemeIconOptions(QAbstractFileIconPr
 
 QIcon QAbstractFileIconProviderPrivate::getPlatformThemeIcon(const QFileInfo &info) const
 {
-    if (auto theme = QGuiApplicationPrivate::platformTheme())
+    if (auto theme = QGuiApplicationPrivate::platformTheme()) {
+        if (theme->themeHint(QPlatformTheme::PreferFileIconFromTheme).toBool()) {
+            const QIcon result = getIconThemeIcon(info);
+            if (!result.isNull())
+                return result;
+        }
         return theme->fileIcon(info, toThemeIconOptions(options));
+    }
     return {};
 }
 
@@ -211,8 +223,7 @@ QAbstractFileIconProvider::Options QAbstractFileIconProvider::options() const
 QIcon QAbstractFileIconProvider::icon(IconType type) const
 {
     Q_D(const QAbstractFileIconProvider);
-    const QIcon result = d->getIconThemeIcon(type);
-    return result.isNull() ? d->getPlatformThemeIcon(type) : result;
+    return d->getPlatformThemeIcon(type);
 }
 
 /*!
@@ -225,25 +236,19 @@ QIcon QAbstractFileIconProvider::icon(IconType type) const
 QIcon QAbstractFileIconProvider::icon(const QFileInfo &info) const
 {
     Q_D(const QAbstractFileIconProvider);
-    const QIcon result = d->getIconThemeIcon(info);
-    return result.isNull() ? d->getPlatformThemeIcon(info) : result;
+    return d->getPlatformThemeIcon(info);
 }
 
-/*!
-  Returns the type of the file described by \a info.
-*/
 
-QString QAbstractFileIconProvider::type(const QFileInfo &info) const
+QString QAbstractFileIconProviderPrivate::getFileType(const QFileInfo &info)
 {
-    Q_D(const QAbstractFileIconProvider);
     if (QFileSystemEntry::isRootPath(info.absoluteFilePath()))
         return QGuiApplication::translate("QAbstractFileIconProvider", "Drive");
     if (info.isFile()) {
 #if QT_CONFIG(mimetype)
-        const QMimeType mimeType = d->mimeDatabase.mimeTypeForFile(info);
+        const QMimeType mimeType = QMimeDatabase().mimeTypeForFile(info);
         return mimeType.comment().isEmpty() ? mimeType.name() : mimeType.comment();
 #else
-        Q_UNUSED(d);
         return QGuiApplication::translate("QAbstractFileIconProvider", "File");
 #endif
     }
@@ -273,4 +278,13 @@ QString QAbstractFileIconProvider::type(const QFileInfo &info) const
     return QGuiApplication::translate("QAbstractFileIconProvider", "Unknown");
 }
 
+/*!
+  Returns the type of the file described by \a info.
+*/
+
+QString QAbstractFileIconProvider::type(const QFileInfo &info) const
+{
+    return QAbstractFileIconProviderPrivate::getFileType(info);
+}
+
 QT_END_NAMESPACE