diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-25 18:00:47 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-25 18:00:47 +0200 |
| commit | 913ea0d5cdee3a182a811db2bb9440aee679ae08 (patch) | |
| tree | 79708faf5c379948eb5aa2f84cb24488a9cb0c4f /demos/browser | |
| parent | 5c45c66b1743645b77826ad61508a79eadd48414 (diff) | |
| parent | d9dd68c4400c3ca590ea425d6f3d070ea6094099 (diff) | |
| download | qt4-tools-913ea0d5cdee3a182a811db2bb9440aee679ae08.tar.gz | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
src/opengl/opengl.pro
src/opengl/qgl_p.h
src/plugins/bearer/connman/qconnmanservice_linux.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/assistant/tools/assistant/openpageswidget.h
Diffstat (limited to 'demos/browser')
| -rw-r--r-- | demos/browser/tabwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/browser/tabwidget.cpp b/demos/browser/tabwidget.cpp index ae0c88ef90..cf1cd5606c 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())); } |