diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-29 00:00:10 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-29 00:00:10 (GMT) |
| commit | 94cfa52c94cb5fcd621bcec04dcc4d2546a1a608 (patch) | |
| tree | 691d7ffa2c1c3800b4c68b168c610781b813fdc3 | |
| parent | 1111ad218d6f54434570a8e3141eb37b7370ce01 (diff) | |
| parent | bf5571b485420a945e9fdf3bf5b31cfe4c4d482b (diff) | |
| download | Qt-94cfa52c94cb5fcd621bcec04dcc4d2546a1a608.zip Qt-94cfa52c94cb5fcd621bcec04dcc4d2546a1a608.tar.gz Qt-94cfa52c94cb5fcd621bcec04dcc4d2546a1a608.tar.bz2 | |
Merge branch 'master-upstream' into master-water
| -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()); |