From ca0f9c4ce86bb317079fca2a1cbd3fac925129c4 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Mon, 10 Jun 2024 12:59:41 +0300 Subject: [PATCH] QFileSystemModel: make it clearer how new Roles should be added New Roles in user code should start from `Qt::UserRole + 1`; whereas in Qt code itself it should start from `Qt::UserRole - 1`; adjust the enumerators accordingly, to have less differences between Qt6 and Qt7. Change-Id: Ib20f95e841d4d252fa9dd085530e6f3257d2776d Reviewed-by: Sune Vuorela Reviewed-by: Volker Hilsheimer (cherry picked from commit 0a133035963b83e886578b9621b1275780c7d9cf) Reviewed-by: Qt Cherry-pick Bot --- src/gui/itemmodels/qfilesystemmodel.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/itemmodels/qfilesystemmodel.h b/src/gui/itemmodels/qfilesystemmodel.h index d50d51528d0..9888249fc57 100644 --- a/src/gui/itemmodels/qfilesystemmodel.h +++ b/src/gui/itemmodels/qfilesystemmodel.h @@ -34,12 +34,14 @@ Q_SIGNALS: public: enum Roles { FileIconRole = Qt::DecorationRole, + + FileInfoRole = Qt::UserRole - 4, // New values go before, -5, -6 ..etc QT7_ONLY( - FilePathRole = Qt::UserRole - 4, - FileNameRole = Qt::UserRole - 3, - FilePermissions = Qt::UserRole - 2, + FilePathRole = Qt::UserRole - 3, + FileNameRole = Qt::UserRole - 2, + FilePermissions = Qt::UserRole - 1, ) - FileInfoRole = Qt::UserRole - 1, + QT6_ONLY( FilePathRole = Qt::UserRole + 1, FileNameRole = Qt::UserRole + 2,