diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 21:25:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 21:25:34 (GMT) |
| commit | 7dd4a5bfc7c1b94b3b4ba72507bd299d4f048a17 (patch) | |
| tree | cf16c62cd099bb1d757504c4dda77ba153f1eaba /src | |
| parent | 178a4e12da0601ecc662851e5bf7f124932e1a12 (diff) | |
| parent | eea978b9744c24200496af4f8a37d76228a29320 (diff) | |
| download | Qt-7dd4a5bfc7c1b94b3b4ba72507bd299d4f048a17.zip Qt-7dd4a5bfc7c1b94b3b4ba72507bd299d4f048a17.tar.gz Qt-7dd4a5bfc7c1b94b3b4ba72507bd299d4f048a17.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed an assert in QMenu
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index f84059d..7941c4e 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -983,19 +983,9 @@ bool QMenuPrivate::mouseEventTaken(QMouseEvent *e) return false; } -class ExceptionGuard -{ -public: - inline ExceptionGuard(bool *w = 0) : watched(w) { Q_ASSERT(!(*watched)); *watched = true; } - inline ~ExceptionGuard() { *watched = false; } - inline operator bool() { return *watched; } -private: - bool *watched; -}; - void QMenuPrivate::activateCausedStack(const QList<QPointer<QWidget> > &causedStack, QAction *action, QAction::ActionEvent action_e, bool self) { - ExceptionGuard guard(&activationRecursionGuard); + QBoolBlocker guard(activationRecursionGuard); #ifdef QT3_SUPPORT const int actionId = q_func()->findIdForAction(action); #endif |