diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 16:30:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 16:30:15 (GMT) |
| commit | 1422686ebbba55c64d6e6a7bbe33db72af317711 (patch) | |
| tree | e5522199d2f9887cf269831cfe15e40393b538b8 /src | |
| parent | 5d1d426afe07458a91b4908881554653285ed04c (diff) | |
| parent | 13df3749820f3fd1847e4359b302da052eef5137 (diff) | |
| download | Qt-1422686ebbba55c64d6e6a7bbe33db72af317711.zip Qt-1422686ebbba55c64d6e6a7bbe33db72af317711.tar.gz Qt-1422686ebbba55c64d6e6a7bbe33db72af317711.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QAbstractItemView::setIndexWidget: remove the old widget from the QSet of persistent editors
Fixed qgl autotest failures on Maemo.
Skip complex FBO tests if combined depth-stencil isn't supported
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/itemviews/qabstractitemview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index bc6db90..4931b46 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -3046,6 +3046,7 @@ void QAbstractItemView::setIndexWidget(const QModelIndex &index, QWidget *widget if (!d->isIndexValid(index)) return; if (QWidget *oldWidget = indexWidget(index)) { + d->persistent.remove(oldWidget); d->removeEditor(oldWidget); oldWidget->deleteLater(); } |