diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-25 11:28:35 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-25 11:28:35 (GMT) |
| commit | 6729645b28f6acfeab9bb0bc488ca4143c480f5a (patch) | |
| tree | 460b440bdaa684f42f0bd8d024829673747cb727 /src/gui/itemviews/qdirmodel.cpp | |
| parent | ea0b7da7f5c206c436999b35bc2b55fb8863ecfe (diff) | |
| parent | 3eed4c454a58b38c895925b74e47a0b1b747df80 (diff) | |
| download | Qt-6729645b28f6acfeab9bb0bc488ca4143c480f5a.zip Qt-6729645b28f6acfeab9bb0bc488ca4143c480f5a.tar.gz Qt-6729645b28f6acfeab9bb0bc488ca4143c480f5a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
Diffstat (limited to 'src/gui/itemviews/qdirmodel.cpp')
| -rw-r--r-- | src/gui/itemviews/qdirmodel.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp index 378a238..48599bc 100644 --- a/src/gui/itemviews/qdirmodel.cpp +++ b/src/gui/itemviews/qdirmodel.cpp @@ -1182,12 +1182,18 @@ QFileInfo QDirModel::fileInfo(const QModelIndex &index) const void QDirModelPrivate::init() { + Q_Q(QDirModel); filters = QDir::AllEntries | QDir::NoDotAndDotDot; sort = QDir::Name; nameFilters << QLatin1String("*"); root.parent = 0; root.info = QFileInfo(); clear(&root); + QHash<int, QByteArray> roles = q->roleNames(); + roles.insertMulti(QDirModel::FileIconRole, "fileIcon"); // == Qt::decoration + roles.insert(QDirModel::FilePathRole, "filePath"); + roles.insert(QDirModel::FileNameRole, "fileName"); + q->setRoleNames(roles); } QDirModelPrivate::QDirNode *QDirModelPrivate::node(int row, QDirNode *parent) const |