diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-02 06:00:42 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-02 06:00:42 (GMT) |
| commit | fdf48e6dc126414bd34db1af3ede601f025acbb0 (patch) | |
| tree | ef40c8cf72477f968bcbb657f570a10fb1a9330e /src/gui/widgets | |
| parent | 120ce340065ab62780032589fd79b8d3e154c81d (diff) | |
| parent | 63fba94e074c29f17e35c7cf9133d1878b18401f (diff) | |
| download | Qt-fdf48e6dc126414bd34db1af3ede601f025acbb0.zip Qt-fdf48e6dc126414bd34db1af3ede601f025acbb0.tar.gz Qt-fdf48e6dc126414bd34db1af3ede601f025acbb0.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenu_p.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qstatusbar.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h index 9654126..f08283d 100644 --- a/src/gui/widgets/qmenu_p.h +++ b/src/gui/widgets/qmenu_p.h @@ -220,7 +220,7 @@ public: virtual QList<QPointer<QWidget> > calcCausedStack() const; QMenuCaused causedPopup; void hideUpToMenuBar(); - void hideMenu(QMenu *menu, bool delay = true); + void hideMenu(QMenu *menu, bool justRegister = false); //index mappings inline QAction *actionAt(int i) const { return q_func()->actions().at(i); } diff --git a/src/gui/widgets/qstatusbar.cpp b/src/gui/widgets/qstatusbar.cpp index c970838..3829bcb 100644 --- a/src/gui/widgets/qstatusbar.cpp +++ b/src/gui/widgets/qstatusbar.cpp @@ -144,7 +144,7 @@ QRect QStatusBarPrivate::messageRect() const if (rtl) left = qMax(left, item->w->x() + item->w->width() + 2); else - right = qMin(right, item->w->x()-1); + right = qMin(right, item->w->x() - 2); } break; } |