summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmenubar.cpp
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-08-12 07:12:25 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-08-12 07:12:25 (GMT)
commit224d8f7619447a4784da533ac26760ea1e7b9087 (patch)
tree5407614135100025a375acf049ace2074e3e6f11 /src/gui/widgets/qmenubar.cpp
parente7a19af4430b45f371bb33120f0ed39a2c83b733 (diff)
parentadd9c43407a63c28f1107b9a77e74f6f62593246 (diff)
downloadQt-224d8f7619447a4784da533ac26760ea1e7b9087.zip
Qt-224d8f7619447a4784da533ac26760ea1e7b9087.tar.gz
Qt-224d8f7619447a4784da533ac26760ea1e7b9087.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
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);
}