From b1301fffe9718f814f36a955d4544a1f1502b73f Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Thu, 6 Jun 2024 23:28:04 +0300 Subject: [PATCH] QFileSystemModel: replace a TODO with QT{6,7}Only So that it's not forgotten come Qt7. Amends 19258608e9ea02043ce9b53d4a9c99700ce49c1b. Change-Id: I323f2d2738a295faa1e118c3ea7c8a5b6c6d0ac7 Reviewed-by: Volker Hilsheimer (cherry picked from commit ef8e1e5861292514a676c5fed4d670fb6ecb887d) Reviewed-by: Qt Cherry-pick Bot --- src/gui/itemmodels/qfilesystemmodel.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gui/itemmodels/qfilesystemmodel.h b/src/gui/itemmodels/qfilesystemmodel.h index 1fd1041f154..d50d51528d0 100644 --- a/src/gui/itemmodels/qfilesystemmodel.h +++ b/src/gui/itemmodels/qfilesystemmodel.h @@ -32,13 +32,19 @@ Q_SIGNALS: void directoryLoaded(const QString &path); public: - // ### Qt 7: renumber these values to be before Qt::UserRole comment. enum Roles { FileIconRole = Qt::DecorationRole, + QT7_ONLY( + FilePathRole = Qt::UserRole - 4, + FileNameRole = Qt::UserRole - 3, + FilePermissions = Qt::UserRole - 2, + ) FileInfoRole = Qt::UserRole - 1, + QT6_ONLY( FilePathRole = Qt::UserRole + 1, FileNameRole = Qt::UserRole + 2, FilePermissions = Qt::UserRole + 3, + ) }; enum Option