diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-06 09:28:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-06 09:28:55 (GMT) |
| commit | a6a8bee86f7e13d49d9115eb33aaee999bd15ad5 (patch) | |
| tree | 6965ebdba00a655ee879bc969986cd24753c6823 /src/declarative/graphicsitems/qdeclarativepathview.cpp | |
| parent | 97e045f48a331ff97b87bd207fb811277a4fa695 (diff) | |
| parent | 05b9137fe1974aa123ce6d9c16b733e1f77d8269 (diff) | |
| download | Qt-a6a8bee86f7e13d49d9115eb33aaee999bd15ad5.zip Qt-a6a8bee86f7e13d49d9115eb33aaee999bd15ad5.tar.gz Qt-a6a8bee86f7e13d49d9115eb33aaee999bd15ad5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
PathView crashed when the path is provided with undefined values.
PathView: update modelCount before attempting to regenerate delegates.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativepathview.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativepathview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index e3987d0..74d3418 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -1318,8 +1318,10 @@ void QDeclarativePathView::componentComplete() // It is possible that a refill has already happended to to Path // bindings being handled in the componentComplete(). If so // don't do it again. - if (d->items.count() == 0) + if (d->items.count() == 0 && d->model) { + d->modelCount = d->model->count(); d->regenerate(); + } d->updateHighlight(); } |