diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-15 17:22:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-15 17:22:28 (GMT) |
| commit | 95041125b578b18f14b5c38b51bfc5afb4419a57 (patch) | |
| tree | d044164a9f4aaa3ae875c2c6859573fc1259168d /src | |
| parent | e2b42a54ddd25e4ceb76b4aeb7de1ffb971feb83 (diff) | |
| parent | ae81a6d27fe090b63fa04ddcb0424e2058a83110 (diff) | |
| download | Qt-95041125b578b18f14b5c38b51bfc5afb4419a57.zip Qt-95041125b578b18f14b5c38b51bfc5afb4419a57.tar.gz Qt-95041125b578b18f14b5c38b51bfc5afb4419a57.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Fix Memoy leak relateded to contextmenu.
Set execution bits for .test files.
Diffstat (limited to 'src')
| -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) |