summaryrefslogtreecommitdiffstats
path: root/src/declarative/extra/qmlfolderlistmodel.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-07-16 01:52:12 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-07-16 01:52:12 (GMT)
commit24b0ad11174118e327a778bbdf16fa64a5eb640c (patch)
treecd5145da4b07ff51f240ec8d57f11a461ac0ab20 /src/declarative/extra/qmlfolderlistmodel.cpp
parent84637da766fe1e3a4b4240601a6002f94f1b07c9 (diff)
parentc9a868fecbe08f78c9fc5dc763a5ad178808ad77 (diff)
downloadQt-24b0ad11174118e327a778bbdf16fa64a5eb640c.zip
Qt-24b0ad11174118e327a778bbdf16fa64a5eb640c.tar.gz
Qt-24b0ad11174118e327a778bbdf16fa64a5eb640c.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/extra/qmlfolderlistmodel.cpp')
-rw-r--r--src/declarative/extra/qmlfolderlistmodel.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/extra/qmlfolderlistmodel.cpp b/src/declarative/extra/qmlfolderlistmodel.cpp
index acee5e1..4a71109 100644
--- a/src/declarative/extra/qmlfolderlistmodel.cpp
+++ b/src/declarative/extra/qmlfolderlistmodel.cpp
@@ -161,7 +161,9 @@ void QmlFolderListModel::classComplete()
bool QmlFolderListModel::isFolder(int index) const
{
Q_D(const QmlFolderListModel);
- return d->model.isDir(d->model.index(index, 0, d->folderIndex));
+ if (index != -1)
+ return d->model.isDir(d->model.index(index, 0, d->folderIndex));
+ return false;
}
void QmlFolderListModel::refresh()