summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2010-12-21 09:29:19 (GMT)
committerGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2010-12-21 12:48:03 (GMT)
commitb696d941c06535b7a7813c4d3b39dbd3710476e4 (patch)
tree3fecce273a4ceacde7468c303536a5be774dc6cf /src
parentad23f356e503536b34ea8e59aa3390459d1bbfea (diff)
downloadQt-b696d941c06535b7a7813c4d3b39dbd3710476e4.zip
Qt-b696d941c06535b7a7813c4d3b39dbd3710476e4.tar.gz
Qt-b696d941c06535b7a7813c4d3b39dbd3710476e4.tar.bz2
Fix timer warning when deleting item views
Reviewed-by: Olivier Task-number: QTBUG-16175
Diffstat (limited to 'src')
-rw-r--r--src/gui/itemviews/qabstractitemview.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 177b088..a7960ae 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -595,8 +595,15 @@ QAbstractItemView::QAbstractItemView(QAbstractItemViewPrivate &dd, QWidget *pare
*/
QAbstractItemView::~QAbstractItemView()
{
- // stop this timer here before ~QObject
- d_func()->delayedReset.stop();
+ Q_D(QAbstractItemView);
+ // stop these timers here before ~QObject
+ d->delayedReset.stop();
+ d->updateTimer.stop();
+ d->delayedEditing.stop();
+ d->delayedAutoScroll.stop();
+ d->autoScrollTimer.stop();
+ d->delayedLayout.stop();
+ d->fetchMoreTimer.stop();
}
/*!