diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-22 01:00:10 +0100 |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-22 01:00:10 +0100 |
| commit | 8944904f0688f30547b80300627bb5e08abcca40 (patch) | |
| tree | 98527e1d1cf8fb40c60ff29fdc49fb9227097dce /src/gui/itemviews | |
| parent | cb0dbc32c957fce25e36587d4f533a693b1e7735 (diff) | |
| parent | d37a3529ec883985b2967265f0797d749db74308 (diff) | |
Merge branch 'master-upstream' into master-water
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(); } /*! |