diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-24 00:49:54 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-24 00:49:54 (GMT) |
| commit | 7104b7598f6c8d61d008edab227cfce3ec4442fc (patch) | |
| tree | e390a009bbc0826af59b105f7d5501a3f59028a3 /src/gui/widgets | |
| parent | b827967fef469f66a5a2f975bfafc3cdb82c4ffb (diff) | |
| parent | cb23151d3abfdbdf291abe8a1510592db2011927 (diff) | |
| download | Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.zip Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.tar.gz Qt-7104b7598f6c8d61d008edab227cfce3ec4442fc.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
src/gui/styles/qmacstyle_mac.mm
Diffstat (limited to 'src/gui/widgets')
| -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 |