summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2011-01-09 10:23:54 +0100
committerAndrea Diamantini <adjam7@gmail.com>2011-01-09 10:23:54 +0100
commita6658db5ed42c3c261373370fb918063e5135bfc (patch)
tree5535860aa8cd9f9de5585dfb4ba3b4fb9f02cb5b /src/mainwindow.cpp
parentAutomatically expand grouped search in panels (diff)
parentTab bar preview optimization, use event->pos() to get the position of tab ins... (diff)
downloadrekonq-a6658db5ed42c3c261373370fb918063e5135bfc.tar.xz
Merge branch 'master' of git.kde.org:rekonq
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 599295f7..963d405e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -388,7 +388,7 @@ void MainWindow::setupActions()
a->setShortcut(reloadShortcut);
a = new KAction(KIcon("process-stop"), i18n("&Stop"), this);
- a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_Period));
+ a->setShortcut(KShortcut(Qt::Key_Escape));
actionCollection()->addAction(QL1S("stop"), a);
connect(a, SIGNAL(triggered(bool)), m_view, SLOT(webStop()));