summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmenubar.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-08-17 14:00:47 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-08-17 14:00:47 (GMT)
commit36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce (patch)
treef65778c976c7ac5f1fa6fb81e8e33982f1fd2e82 /src/gui/widgets/qmenubar.cpp
parent86c3fed122b8a6e47904d958f8c50fa19e668434 (diff)
parentff6f17c92ad1bfa898bc89a5ccb65361d443c591 (diff)
downloadQt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.zip
Qt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.tar.gz
Qt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.tar.bz2
Merge branch '4.7' into qmldocs
Diffstat (limited to 'src/gui/widgets/qmenubar.cpp')
-rw-r--r--src/gui/widgets/qmenubar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index e8e80b7..df16f7f 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -102,7 +102,7 @@ void QMenuBarExtension::paintEvent(QPaintEvent *)
QStylePainter p(this);
QStyleOptionToolButton opt;
initStyleOption(&opt);
- // We do not need to draw both extention arrows
+ // We do not need to draw both extension arrows
opt.features &= ~QStyleOptionToolButton::HasMenu;
p.drawComplexControl(QStyle::CC_ToolButton, opt);
}