summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-06-10 13:20:17 -0500
committerTimothy Pearson <[email protected]>2013-06-10 13:20:17 -0500
commitf2102e1f829d216591a5f49819847c05383305ae (patch)
tree70f9fcdaafc62956e31c6ed585fbf4827f285436 /src/widgets
parent8ff73908ee9670f5ce72613b65bf1b21b9544b96 (diff)
downloadqt3-f2102e1f829d216591a5f49819847c05383305ae.tar.gz
qt3-f2102e1f829d216591a5f49819847c05383305ae.zip
Fix incorrect thread termination handling when thread count is greater than two
This resolves Bug 1521 Make double free or delete of QString objects more obvious
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/qlistview.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 6f8ec29..6e2564c 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -5181,11 +5181,13 @@ void QListView::keyPressEvent( QKeyEvent * e )
QListViewItem * QListView::itemAt( const QPoint & viewPos ) const
{
- if ( viewPos.x() > contentsWidth() - contentsX() )
+ if ( viewPos.x() > contentsWidth() - contentsX() ) {
return 0;
+ }
- if ( !d->drawables || d->drawables->isEmpty() )
+ if ( !d->drawables || d->drawables->isEmpty() ) {
buildDrawableList();
+ }
QListViewPrivate::DrawableItem * c = d->drawables->first();
int g = viewPos.y() + contentsY();