Merge branch '4.6'

Conflicts:
	src/corelib/global/qglobal.h
	src/gui/dialogs/qfiledialog_win.cpp
	src/plugins/qpluginbase.pri
	src/qbase.pri
	tests/auto/selftests/expected_cmptest.txt
	tests/auto/selftests/expected_crashes_3.txt
	tests/auto/selftests/expected_longstring.txt
	tests/auto/selftests/expected_maxwarnings.txt
	tests/auto/selftests/expected_skip.txt
	tools/assistant/tools/assistant/doc/assistant.qdocconf
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt.qdocconf

2 files changed, 8 insertions, 4 deletions

diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index d1cccc1..5a856f7 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -224,6 +224,7 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent)
     QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
 
     vboxLayout->setMargin(0);
+    tabWidget = new QTabWidget(this);
 #ifndef Q_OS_MAC
     resourcePath.append(QLatin1String("win"));
 #else
@@ -231,7 +232,6 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent)
     tabWidget->setDocumentMode(true);
 #endif
 
-    tabWidget = new QTabWidget(this);
     connect(tabWidget, SIGNAL(currentChanged(int)), this,
         SLOT(currentPageChanged(int)));
 
diff --git a/tools/assistant/tools/assistant/indexwindow.cpp b/tools/assistant/tools/assistant/indexwindow.cpp
index 6d35649..97828c1 100644
--- a/tools/assistant/tools/assistant/indexwindow.cpp
+++ b/tools/assistant/tools/assistant/indexwindow.cpp
@@ -112,18 +112,22 @@ bool IndexWindow::eventFilter(QObject *obj, QEvent *e)
         case Qt::Key_Up:
             idx = m_indexWidget->model()->index(idx.row()-1,
                 idx.column(), idx.parent());
-            if (idx.isValid())
+            if (idx.isValid()) {
                 m_indexWidget->setCurrentIndex(idx);
+                return true;
+            }
             break;
         case Qt::Key_Down:
             idx = m_indexWidget->model()->index(idx.row()+1,
                 idx.column(), idx.parent());
-            if (idx.isValid())
+            if (idx.isValid()) {
                 m_indexWidget->setCurrentIndex(idx);
+                return true;
+            }
             break;
         case Qt::Key_Escape:
             emit escapePressed();
-            break;
+            return true;
         default: ; // stop complaining
         }
     } else if (obj == m_indexWidget && e->type() == QEvent::ContextMenu) {