diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-13 14:25:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-13 14:25:05 (GMT) |
| commit | 0a99d5ed94de27b45ba4bc86c1c27d6c57ea7c1b (patch) | |
| tree | c1676f4b4d0fa8b1cc4491a487052fb2e9e940c1 | |
| parent | bf527566d9ef9914c71a7514c52aa85dd2bd1db7 (diff) | |
| parent | 00bbab0dbfde79cfc6a3dc6060d7c87763f07482 (diff) | |
| download | Qt-0a99d5ed94de27b45ba4bc86c1c27d6c57ea7c1b.zip Qt-0a99d5ed94de27b45ba4bc86c1c27d6c57ea7c1b.tar.gz Qt-0a99d5ed94de27b45ba4bc86c1c27d6c57ea7c1b.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Fix Memoy leak relateded to contextmenu.
Set execution bits for .test files.
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index a490286..eb57caa 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -513,7 +513,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) |