Merge remote-tracking branch 'origin/stable' into dev

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
index c17a03e058..cd6433bbe7 100644
--- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
+++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
@@ -46,6 +46,8 @@
 #include <qwindow.h>
 #include <qwidget.h>
 
+#include <qdockwidget.h>
+#include <qmainwindow.h>
 
 
 class Window : public QWindow
@@ -80,6 +82,7 @@ private slots:
     void testUnparenting();
     void testActivation();
     void testAncestorChange();
+    void testDockWidget();
 };
 
 
@@ -278,6 +281,7 @@ void tst_QWindowContainer::testAncestorChange()
     newRoot->setGeometry(100, 100, 200, 200);
     newRoot->show();
     QVERIFY(QTest::qWaitForWindowExposed(newRoot));
+    QCOMPARE(newRoot->windowHandle(), window->parent());
     //      newRoot
     //      + right
     //        + container
@@ -285,6 +289,31 @@ void tst_QWindowContainer::testAncestorChange()
     QCOMPARE(window->geometry(), QRect(100, 0, 100, 100));
 }
 
+
+void tst_QWindowContainer::testDockWidget()
+{
+    QMainWindow mainWindow;
+    mainWindow.resize(200, 200);
+
+    QDockWidget *dock = new QDockWidget();
+    QWindow *window = new QWindow();
+    QWidget *container = QWidget::createWindowContainer(window);
+    dock->setWidget(container);
+    mainWindow.addDockWidget(Qt::RightDockWidgetArea, dock);
+
+    mainWindow.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&mainWindow));
+    QVERIFY(window->parent() == mainWindow.window()->windowHandle());
+
+    QTest::qWait(1000);
+    dock->setFloating(true);
+    QTRY_VERIFY(window->parent() != mainWindow.window()->windowHandle());
+
+    QTest::qWait(1000);
+    dock->setFloating(false);
+    QTRY_VERIFY(window->parent() == mainWindow.window()->windowHandle());
+}
+
 QTEST_MAIN(tst_QWindowContainer)
 
 #include "tst_qwindowcontainer.moc"