diff options
| author | Debao Zhang <dbzhang800@gmail.com> | 2011-11-18 22:40:47 +0800 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-13 16:36:33 +0100 |
| commit | 7694599ef933b306d54116723adab0d5d8651ff5 (patch) | |
| tree | 5c980b008f59bce4604157189619f979a6793831 /src | |
| parent | d308797d0093c686493e616fa2f435f9119a8fbf (diff) | |
Fix Memory leak related to Content Menu
From Qt4.7 on, the contextmenu of
QTextEdit/QPlainTextEdit/QLineEdit/QLabel/QMainWindow etc using
QMenu::popup() instead of QMenu::exec(), but the
setAttribute(Qt::WA_DeleteOnClose) does not work, as QMenu::close()
isn't called when the menus disapper. And this causes a memory leak.
This is a side effect of b7af368e86874d71ffc9071c9ef009814d6a3467
Task-number: QTBUG-22817
Task-number: QTBUG-19592
Change-Id: I4c2c3edb3f63ce914b7b57cd0fbcec20488c8315
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/widgets/qmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index b8ba2cdf5d..3bcba686be 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -500,7 +500,7 @@ void QMenuPrivate::hideMenu(QMenu *menu, bool justRegister) menu->blockSignals(false); #endif // QT_NO_EFFECTS if (!justRegister) - menu->hide(); + menu->close(); } void QMenuPrivate::popupAction(QAction *action, int delay, bool activateFirst) |