diff options
| author | Michael Brasser <mbrasser@ford.com> | 2020-02-22 16:24:35 -0600 |
|---|---|---|
| committer | Michael Brasser <mbrasser@ford.com> | 2020-03-24 09:19:35 -0600 |
| commit | 692e7cfdad0df2989dea37c9bfaeb0a0bcc41935 (patch) | |
| tree | 43ed358bc6450c827d21c62959f5ff25c0d7b965 /src/imports | |
| parent | 7be805d155f48b2ee9dfcb80ae2919597d0adf5a (diff) | |
Add standard casing for FolderListModel::fileUrl
Task-number: QTBUG-82298
Change-Id: Iad95b7a90c2c247c44b8656b0fd104843bd4fa8c
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 10 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.h | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp index 26c6d4032f..44f0a49d76 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -255,7 +255,8 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path) \list \li \c fileName \li \c filePath - \li \c fileURL (since Qt 5.2) + \li \c fileURL (since Qt 5.2; deprecated since Qt 5.15) + \li \c fileUrl (since Qt 5.15) \li \c fileBaseName \li \c fileSuffix \li \c fileSize @@ -334,7 +335,8 @@ QQuickFolderListModel::QQuickFolderListModel(QObject *parent) d->roleNames[FileLastModifiedRole] = "fileModified"; d->roleNames[FileLastReadRole] = "fileAccessed"; d->roleNames[FileIsDirRole] = "fileIsDir"; - d->roleNames[FileUrlRole] = "fileURL"; + d->roleNames[FileUrlRole] = "fileUrl"; + d->roleNames[FileURLRole] = "fileURL"; d->init(); } @@ -377,6 +379,7 @@ QVariant QQuickFolderListModel::data(const QModelIndex &index, int role) const rv = d->data.at(index.row()).isDir(); break; case FileUrlRole: + case FileURLRole: rv = QUrl::fromLocalFile(d->data.at(index.row()).filePath()); break; default: @@ -886,7 +889,8 @@ void QQuickFolderListModel::setSortCaseSensitive(bool on) \list \li \c fileName \li \c filePath - \li \c fileURL (since Qt 5.2) + \li \c fileURL (since Qt 5.2; deprecated since Qt 5.15) + \li \c fileUrl (since Qt 5.15) \li \c fileBaseName \li \c fileSuffix \li \c fileSize diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h index 5897bd2e0f..772976d65a 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.h +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h @@ -94,7 +94,8 @@ public: FileLastModifiedRole = Qt::UserRole + 6, FileLastReadRole = Qt::UserRole +7, FileIsDirRole = Qt::UserRole + 8, - FileUrlRole = Qt::UserRole + 9 + FileUrlRole = Qt::UserRole + 9, + FileURLRole = Qt::UserRole + 10 }; int rowCount(const QModelIndex &parent = QModelIndex()) const override; |