diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-28 14:57:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-28 14:57:13 (GMT) |
| commit | bf5571b485420a945e9fdf3bf5b31cfe4c4d482b (patch) | |
| tree | f302059d5675f93deab588e23440e99defa6cba2 | |
| parent | 66ca4c949adaae5e3e07bbb776646bee283effdc (diff) | |
| parent | c4c27dd09c8caade06bba4143833a5dbba0cd6e6 (diff) | |
| download | Qt-bf5571b485420a945e9fdf3bf5b31cfe4c4d482b.zip Qt-bf5571b485420a945e9fdf3bf5b31cfe4c4d482b.tar.gz Qt-bf5571b485420a945e9fdf3bf5b31cfe4c4d482b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Rename File > Quit to Exit on Windows.
| -rw-r--r-- | tools/assistant/tools/assistant/mainwindow.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index 48469d4..d7d01da 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -460,14 +460,20 @@ void MainWindow::setupActions() menu->addAction(globalActions->printAction()); menu->addSeparator(); - QAction *tmp = menu->addAction(QIcon::fromTheme("application-exit"), - tr("&Quit"), this, SLOT(close())); - tmp->setMenuRole(QAction::QuitRole); + m_closeTabAction = menu->addAction(tr("&Close Tab"), m_centralWidget, + SLOT(closeTab())); + m_closeTabAction->setShortcuts(QKeySequence::Close); + + QIcon appExitIcon = QIcon::fromTheme("application-exit"); + QAction *tmp; #ifdef Q_OS_WIN + tmp = menu->addAction(appExitIcon, tr("E&xit"), this, SLOT(close())); tmp->setShortcut(QKeySequence(tr("CTRL+Q"))); #else + tmp = menu->addAction(appExitIcon, tr("&Quit"), this, SLOT(close())); tmp->setShortcut(QKeySequence::Quit); #endif + tmp->setMenuRole(QAction::QuitRole); menu = menuBar()->addMenu(tr("&Edit")); menu->addAction(globalActions->copyAction()); |