Merge master into api_changes

Conflicts:
	src/corelib/tools/qvector.h
	tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp

Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6

1 files changed, 32 insertions, 1 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index fb9a8e630c..3075726cae 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -862,7 +862,7 @@ QT_BEGIN_NAMESPACE
 /*! \fn bool QTest::qWaitForWindowShown(QWidget *window)
     \since 4.6
 
-    Waits until the \a window is shown in the screen. This is mainly useful for
+    Waits until the \a window is shown on the screen. This is mainly useful for
     asynchronous systems like X11, where a window will be mapped to screen some
     time after being asked to show itself on the screen. Returns true.
 
@@ -870,6 +870,37 @@ QT_BEGIN_NAMESPACE
     \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 24
 */
 
+/*! \fn bool QTest::qWaitForWindowShown(QWindow *window, int timeout)
+    \since 5.0
+
+    Waits for \a timeout milliseconds or until the \a window is shown on the screen.
+    This is mainly useful for asynchronous systems like X11, where a window will be mapped to screen some
+    time after being asked to show itself on the screen.
+
+    Returns true if \c window is show in \a timout milliseconds, otherwise returns false.
+
+    \sa QTest::qWaitForWindowActive(), QTest::qWaitForWindowExposed()
+*/
+
+/*! \fn bool QTest::qWaitForWindowActive(QWindow *window, int timeout)
+    \since 5.0
+
+    Waits for \a timeout milliseconds or until the \a window is active.
+
+    Returns true if \c window is active in \a timout milliseconds, otherwise returns false.
+
+    \sa QTest::qWaitForWindowActive(), QTest::qWaitForWindowShown(), QWindow::isActive()
+*/
+
+/*! \fn bool QTest::qWaitForWindowExposed(QWindow *window, int timeout)
+    \since 5.0
+
+    Waits for \a timeout milliseconds or until the \a window is exposed.
+    Returns true if \c window is exposed in \a timout milliseconds, otherwise returns false.
+
+    \sa QTest::qWaitForWindowShown(), QTest::qWaitForWindowExposed(), QWindow::isExposed()
+*/
+
 /*!
     \class QTest::QTouchEventSequence
     \inmodule QtTest