summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-08-20 12:57:58 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-08-20 12:57:58 (GMT)
commite079c49cbf821856ddb7da05146b1f2bee585fae (patch)
tree52a0298fd843408e4c8ac93ee96096062fef9c37
parent03abf319de8920dc1b72782da3e9e0fdf193d9f6 (diff)
parent5b177dd50d1ea0eb9130c631757a687782a23cd3 (diff)
downloadQt-e079c49cbf821856ddb7da05146b1f2bee585fae.zip
Qt-e079c49cbf821856ddb7da05146b1f2bee585fae.tar.gz
Qt-e079c49cbf821856ddb7da05146b1f2bee585fae.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
-rw-r--r--demos/browser/tabwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/browser/tabwidget.cpp b/demos/browser/tabwidget.cpp
index ae0c88e..cf1cd56 100644
--- a/demos/browser/tabwidget.cpp
+++ b/demos/browser/tabwidget.cpp
@@ -67,12 +67,12 @@ TabBar::TabBar(QWidget *parent)
connect(this, SIGNAL(customContextMenuRequested(QPoint)),
this, SLOT(contextMenuRequested(QPoint)));
- QString alt = QLatin1String("Alt+%1");
+ QString ctrl = QLatin1String("Ctrl+%1");
for (int i = 1; i <= 10; ++i) {
int key = i;
if (key == 10)
key = 0;
- QShortcut *shortCut = new QShortcut(alt.arg(key), this);
+ QShortcut *shortCut = new QShortcut(ctrl.arg(key), this);
m_tabShortcuts.append(shortCut);
connect(shortCut, SIGNAL(activated()), this, SLOT(selectTabAction()));
}