Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Doc: Changes to the index page and second level pages linking to the index page.
  Use Ctrl rather than Alt for switching tabs in the demo browser
  Doc: fixing creator bugs, removing menus and textbox in the header
  Update Japanese translations
  Ukrainian translation updated
  qtconfig and qvfb internationalization fixes
  add full width characters to ending() in linguist
  QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter
  qdoc: Changed id attribute to be a UUID.
  just build connman and networkmanager plugins on linux

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()));
     }