summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.cpp20
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.h1
2 files changed, 15 insertions, 6 deletions
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index bbe1ef4376..023f3f64fa 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -1264,6 +1264,20 @@ Qt::DropActions QFileSystemModel::supportedDropActions() const
}
/*!
+ \reimp
+*/
+QHash<int, QByteArray> QFileSystemModel::roleNames() const
+{
+ auto ret = QAbstractItemModel::roleNames();
+ ret.insert(QFileSystemModel::FileIconRole,
+ QByteArrayLiteral("fileIcon")); // == Qt::decoration
+ ret.insert(QFileSystemModel::FilePathRole, QByteArrayLiteral("filePath"));
+ ret.insert(QFileSystemModel::FileNameRole, QByteArrayLiteral("fileName"));
+ ret.insert(QFileSystemModel::FilePermissions, QByteArrayLiteral("filePermissions"));
+ return ret;
+}
+
+/*!
\enum QFileSystemModel::Option
\since 5.14
@@ -2075,12 +2089,6 @@ void QFileSystemModelPrivate::init()
q, SIGNAL(directoryLoaded(QString)));
#endif // filesystemwatcher
q->connect(&delayedSortTimer, SIGNAL(timeout()), q, SLOT(_q_performDelayedSort()), Qt::QueuedConnection);
-
- roleNames.insert(QFileSystemModel::FileIconRole,
- QByteArrayLiteral("fileIcon")); // == Qt::decoration
- roleNames.insert(QFileSystemModel::FilePathRole, QByteArrayLiteral("filePath"));
- roleNames.insert(QFileSystemModel::FileNameRole, QByteArrayLiteral("fileName"));
- roleNames.insert(QFileSystemModel::FilePermissions, QByteArrayLiteral("filePermissions"));
}
/*!
diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h
index b0f289dfcd..a2c6e2c2a0 100644
--- a/src/widgets/dialogs/qfilesystemmodel.h
+++ b/src/widgets/dialogs/qfilesystemmodel.h
@@ -115,6 +115,7 @@ public:
bool dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent) override;
Qt::DropActions supportedDropActions() const override;
+ QHash<int, QByteArray> roleNames() const override;
// QFileSystemModel specific API
QModelIndex setRootPath(const QString &path);