summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews/qabstractitemview.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-12-15 17:53:57 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-12-15 17:58:10 (GMT)
commit981a83d7832e8cd1ee7bcd42dfaba62f0b04f2c1 (patch)
tree2c3e2f985c2cb1e54245d225ae850a2f42e8ce18 /src/gui/itemviews/qabstractitemview.cpp
parent7b0809edf975f3226b43d3b43b5fe8035298fde9 (diff)
downloadQt-981a83d7832e8cd1ee7bcd42dfaba62f0b04f2c1.zip
Qt-981a83d7832e8cd1ee7bcd42dfaba62f0b04f2c1.tar.gz
Qt-981a83d7832e8cd1ee7bcd42dfaba62f0b04f2c1.tar.bz2
Suppress a warning about killing a timer that isn't active.
The timer was active, but it got killed by ~QObject. The QObject d-pointer is deleted after the timers (as is expected), which means that the QBasicTimer destructors in QAbstractItemViewPrivate are run after the timers are already gone. Reviewed-by: Trust Me
Diffstat (limited to 'src/gui/itemviews/qabstractitemview.cpp')
-rw-r--r--src/gui/itemviews/qabstractitemview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index acc8deb..177b088 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -595,6 +595,8 @@ QAbstractItemView::QAbstractItemView(QAbstractItemViewPrivate &dd, QWidget *pare
*/
QAbstractItemView::~QAbstractItemView()
{
+ // stop this timer here before ~QObject
+ d_func()->delayedReset.stop();
}
/*!