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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (268 commits)
  Better check for EGL extension strings
  Some doc fixes
  Fixes broken selection with Shift and extended selection
  Add extra auto-test for topLevel list corruption.
  QCompleter wouldn't emit highlighted() and activated() signals
  Stabilize tests on X11
  Fix tst_QSystemLock::processes
  qreal-ization
  Fixes transformation problems with QGraphicsProxyWidget.
  Fixed softkey merging/traversing over window boundaries.
  Fixed crash on Symbian when using QProgressDialog::setCancelButton(0).
  Fixed "illegal empty declaration" warning from \tools\xmlpatterns
  qreal-ization
  Reduce double-copying of textures when flipping upside down
  Fix crash in QVector::reserve when reserving smaller size on a shared vector
  QWindowStyle:  make sure there is no duplicate in the list of scrollbar.
  Fixed a potential crash in QDockWidget
  Clarify the docs a bit when setting focus.
  Minor doc update for known-issues wiki link.
  Bump version to 4.6.1
  ...

1 files changed, 1 insertions, 0 deletions

diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp
index 4f4761c..fa2b9bd 100644
--- a/tests/auto/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/qlineedit/tst_qlineedit.cpp
@@ -3362,6 +3362,7 @@ void tst_QLineEdit::task174640_editingFinished()
     QApplication::setActiveWindow(&mw);
     mw.activateWindow();
     QTest::qWaitForWindowShown(&mw);
+    QTRY_COMPARE(&mw, QApplication::activeWindow());
 
     QSignalSpy editingFinishedSpy(le1, SIGNAL(editingFinished()));