summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-17 14:55:11 (GMT)
committerMarkku Luukkainen <markku.luukkainen@digia.com>2009-06-17 14:55:11 (GMT)
commitbb0be7961f66b8d351c39d61fc0ab3f38d032223 (patch)
treefe4b508fb92e4cc6c12dbf1622f347b22f3687dc /src
parentfe98842b7110c05b3588eccde8b45d7d1b5b768c (diff)
downloadQt-bb0be7961f66b8d351c39d61fc0ab3f38d032223.zip
Qt-bb0be7961f66b8d351c39d61fc0ab3f38d032223.tar.gz
Qt-bb0be7961f66b8d351c39d61fc0ab3f38d032223.tar.bz2
Renamed "menu" to "options" for S60. This follows the native style
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qmainwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 5f8371c..394523a 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -482,7 +482,7 @@ void QMainWindow::setMenuBar(QMenuBar *menuBar)
}
d->layout->setMenuBar(menuBar);
if (menuBar) {
- QAction* menu = new QAction(QString::fromLatin1("Menu"), this);
+ QAction* menu = new QAction(QString::fromLatin1("Options"), this);
menu->setSoftKeyRole(QAction::MenuSoftKey);
setSoftKey(menu);
}
@@ -1400,7 +1400,7 @@ bool QMainWindow::event(QEvent *event)
case QEvent::WindowActivate:
if (d->layout->menuBar()) {
// ### TODO: This is evil, there is no need to create a new action every time
- QAction* menu = new QAction(QString::fromLatin1("Menu"), this);
+ QAction* menu = new QAction(QString::fromLatin1("Options"), this);
menu->setSoftKeyRole(QAction::MenuSoftKey);
setSoftKey(menu);
}