diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-20 10:47:02 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-20 10:47:02 +0100 |
| commit | 10c90522d6e3807baac3c4bfca4eedc51a4251f5 (patch) | |
| tree | 92005b547e3b92eb9e640fae8c78fdcdc13b6dd9 /src/gui/itemviews | |
| parent | 64e1f888586f2c988b08bcc93579990e970b7206 (diff) | |
| parent | 97b039438bc31bb420138d72549372adb1244dc8 (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
Diffstat (limited to 'src/gui/itemviews')
| -rw-r--r-- | src/gui/itemviews/qabstractitemview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index f7122d65b4..1bb43fafbd 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -630,6 +630,8 @@ QAbstractItemView::QAbstractItemView(QAbstractItemViewPrivate &dd, QWidget *pare */ QAbstractItemView::~QAbstractItemView() { + // stop this timer here before ~QObject + d_func()->delayedReset.stop(); } /*! |