Move QFileSystemModel into QtGui

This requires a QAbstractFileIconProvider in QtGui, as the standard
QFileIconProvider depends on QStyle, and cannot be moved out of
QtWidgets.

QAbstractFileIconProvider returns strings for file types, but returns
no icons yet. Support for a default icon set might be added in a
follow-up commit.

Change-Id: Ib9d095cd612fdcf04db62f2e40709fcffe3dc2b7
Fixes: QTBUG-66177
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 9 insertions, 1 deletions

diff --git a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
index 146a9e262d..20866a0fa7 100644
--- a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
+++ b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
@@ -29,7 +29,8 @@
 
 #include <QtTest/QtTest>
 #include <QtWidgets/private/qsidebar_p.h>
-#include <QtWidgets/private/qfilesystemmodel_p.h>
+#include <QtGui/private/qfilesystemmodel_p.h>
+#include <QtWidgets/qfileiconprovider.h>
 
 class tst_QSidebar : public QObject {
   Q_OBJECT
@@ -40,12 +41,16 @@ private slots:
     void addUrls();
 
     void goToUrl();
+
+private:
+    QFileIconProvider defaultIconProvider;
 };
 
 void tst_QSidebar::setUrls()
 {
     QList<QUrl> urls;
     QFileSystemModel fsmodel;
+    fsmodel.setIconProvider(&defaultIconProvider);
     QSidebar qsidebar;
     qsidebar.setModelAndUrls(&fsmodel, urls);
     QAbstractItemModel *model = qsidebar.model();
@@ -67,6 +72,7 @@ void tst_QSidebar::selectUrls()
     urls << QUrl::fromLocalFile(QDir::rootPath())
          << QUrl::fromLocalFile(QDir::temp().absolutePath());
     QFileSystemModel fsmodel;
+    fsmodel.setIconProvider(&defaultIconProvider);
     QSidebar qsidebar;
     qsidebar.setModelAndUrls(&fsmodel, urls);
 
@@ -79,6 +85,7 @@ void tst_QSidebar::addUrls()
 {
     QList<QUrl> emptyUrls;
     QFileSystemModel fsmodel;
+    fsmodel.setIconProvider(&defaultIconProvider);
     QSidebar qsidebar;
     qsidebar.setModelAndUrls(&fsmodel, emptyUrls);
     QAbstractItemModel *model = qsidebar.model();
@@ -179,6 +186,7 @@ void tst_QSidebar::goToUrl()
     urls << QUrl::fromLocalFile(QDir::rootPath())
          << QUrl::fromLocalFile(QDir::temp().absolutePath());
     QFileSystemModel fsmodel;
+    fsmodel.setIconProvider(&defaultIconProvider);
     QSidebar qsidebar;
     qsidebar.setModelAndUrls(&fsmodel, urls);
     qsidebar.show();