summaryrefslogtreecommitdiffstats
path: root/src/declarative/extra/qmlfolderlistmodel.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-16 21:36:34 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-16 21:36:34 (GMT)
commit6470f646d0815f67bab507c1362cdda775c42a6e (patch)
tree6389ca2728ec8b78294af60e20b918fdccdf88f1 /src/declarative/extra/qmlfolderlistmodel.cpp
parent50f400ac20e918db1d0a6496003d953dedaba42a (diff)
parent3bd0062535aaa991fadf739f9362851afacb19eb (diff)
downloadQt-6470f646d0815f67bab507c1362cdda775c42a6e.zip
Qt-6470f646d0815f67bab507c1362cdda775c42a6e.tar.gz
Qt-6470f646d0815f67bab507c1362cdda775c42a6e.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()