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/qfiledialog_p.h | |
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/qfiledialog_p.h')
-rw-r--r-- | src/widgets/dialogs/qfiledialog_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index 1d9929e36a..16b8b2f45b 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -57,7 +57,7 @@ #include "private/qdialog_p.h" #include "qplatformdefs.h" -#include "qfilesystemmodel_p.h" +#include <QtGui/private/qfilesystemmodel_p.h> #include <qlistview.h> #include <qtreeview.h> #include <qcombobox.h> @@ -69,6 +69,7 @@ #include <qstackedwidget.h> #include <qdialogbuttonbox.h> #include <qabstractproxymodel.h> +#include <qfileiconprovider.h> #if QT_CONFIG(completer) #include <qcompleter.h> #endif @@ -285,6 +286,7 @@ public: QByteArray splitterState; QByteArray headerData; QList<QUrl> sidebarUrls; + QFileIconProvider defaultIconProvider; ~QFileDialogPrivate(); |