diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-05-30 15:26:06 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-05-30 15:26:06 +1000 |
| commit | b9d5cb9334e7d9da71af169802a01f8d344151a7 (patch) | |
| tree | 5babb1fd2633d5da0121720dcac0a0ec8fedd8ac /src/declarative/graphicsitems/qdeclarativelistview.cpp | |
| parent | f75fda0365a4e4bf1f26dedc40d96d37a2599174 (diff) | |
| download | qt4-tools-b9d5cb9334e7d9da71af169802a01f8d344151a7.tar.gz | |
ListView segmentation fault when setting highlight to null
Setting view highlight to null due to focus change caused a crash
since graphicsview accessed the highlight item after it had been
deleted. Remove highlight item from scene and deleteLater(),
as is done for delegates.
Change-Id: I5bfd59095aca90d3adca805bc4f61c92c192ee1b
Task-number: QTBUG-19509
Reviewed-by: Bea Lam
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativelistview.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativelistview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index b52b6fc850..225b031530 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -943,7 +943,9 @@ void QDeclarativeListViewPrivate::createHighlight() if (highlight) { if (trackedItem == highlight) trackedItem = 0; - delete highlight->item; + if (highlight->item->scene()) + highlight->item->scene()->removeItem(highlight->item); + highlight->item->deleteLater(); delete highlight; highlight = 0; delete highlightPosAnimator; |