diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-01-14 10:33:56 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-01-14 10:37:39 (GMT) |
| commit | c5a226dc46110848eb874212cf4bb2257ada0c84 (patch) | |
| tree | 3e0d5d3df9dcbafba7fd5006d86e78c6547f36c5 /src/gui/dialogs/qfilesystemmodel_p.h | |
| parent | 54d1ad11a4f35c0484418e5d18537daaccc2c6ab (diff) | |
| download | Qt-c5a226dc46110848eb874212cf4bb2257ada0c84.zip Qt-c5a226dc46110848eb874212cf4bb2257ada0c84.tar.gz Qt-c5a226dc46110848eb874212cf4bb2257ada0c84.tar.bz2 | |
Implement showing the volume name for drives on Windows.
Also fix a bug with QCompleter and QFileSystemModel when the popup was
shown even if there was nothing to complete.
Task-number:QTBUG-5376
Reviewed-by:janarve
Diffstat (limited to 'src/gui/dialogs/qfilesystemmodel_p.h')
| -rw-r--r-- | src/gui/dialogs/qfilesystemmodel_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h index 6c85a7c..03e0bfb 100644 --- a/src/gui/dialogs/qfilesystemmodel_p.h +++ b/src/gui/dialogs/qfilesystemmodel_p.h @@ -97,6 +97,9 @@ public: } QString fileName; +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) + QString volumeName; +#endif inline qint64 size() const { if (info && !info->isDir()) return info->size(); return 0; } inline QString type() const { if (info) return info->displayType; return QLatin1String(""); } @@ -278,6 +281,7 @@ public: QIcon icon(const QModelIndex &index) const; QString name(const QModelIndex &index) const; + QString displayName(const QModelIndex &index) const; QString filePath(const QModelIndex &index) const; QString size(const QModelIndex &index) const; static QString size(qint64 bytes); |