diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-08-19 13:40:34 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-08-25 06:33:44 +0200 |
commit | fb9ec8ad44decba7b2878370f3711b61614f035a (patch) | |
tree | 6904b3936a8ee7c61a770ef92a4e033bb18b0fc3 /src/widgets/dialogs/qsidebar.cpp | |
parent | e24bbc4871e6a3711ffaa0e01397a40954465a3a (diff) |
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>
Diffstat (limited to 'src/widgets/dialogs/qsidebar.cpp')
-rw-r--r-- | src/widgets/dialogs/qsidebar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qsidebar.cpp b/src/widgets/dialogs/qsidebar.cpp index 4272b612ec..296542a187 100644 --- a/src/widgets/dialogs/qsidebar.cpp +++ b/src/widgets/dialogs/qsidebar.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qsidebar_p.h" -#include "qfilesystemmodel.h" #include <qaction.h> #include <qurl.h> @@ -48,7 +47,8 @@ #include <qmimedata.h> #include <qevent.h> #include <qdebug.h> -#include <qfileiconprovider.h> +#include <qfilesystemmodel.h> +#include <qabstractfileiconprovider.h> #include <qfiledialog.h> QT_BEGIN_NAMESPACE @@ -198,9 +198,9 @@ void QUrlModel::setUrl(const QModelIndex &index, const QUrl &url, const QModelIn QIcon newIcon = qvariant_cast<QIcon>(dirIndex.data(Qt::DecorationRole)); if (!dirIndex.isValid()) { - const QFileIconProvider *provider = fileSystemModel->iconProvider(); + const QAbstractFileIconProvider *provider = fileSystemModel->iconProvider(); if (provider) - newIcon = provider->icon(QFileIconProvider::Folder); + newIcon = provider->icon(QAbstractFileIconProvider::Folder); newName = QFileInfo(url.toLocalFile()).fileName(); if (!invalidUrls.contains(url)) invalidUrls.append(url); |