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

Conflicts:
	config.tests/unix/compile.test
	src/plugins/platforms/cocoa/qcocoahelpers.mm
	src/tools/qlalr/cppgenerator.cpp

Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
index 3178b31e06..406b21ccf6 100644
--- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
+++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
@@ -76,6 +76,7 @@ private slots:
     void testActivation();
     void testAncestorChange();
     void testDockWidget();
+    void testNativeContainerParent();
     void cleanup();
 
 private:
@@ -325,6 +326,23 @@ void tst_QWindowContainer::testDockWidget()
     QTRY_COMPARE(window->parent(), mainWindow.window()->windowHandle());
 }
 
+void tst_QWindowContainer::testNativeContainerParent()
+{
+    QWidget root;
+    root.setWindowTitle(QTest::currentTestFunction());
+    root.setGeometry(m_availableGeometry.x() + 50, m_availableGeometry.y() + 50, 200, 200);
+
+    Window *window = new Window();
+    QWidget *container = QWidget::createWindowContainer(window, &root);
+    container->setAttribute(Qt::WA_NativeWindow);
+    container->setGeometry(50, 50, 150, 150);
+
+    root.show();
+
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+    QTRY_COMPARE(window->parent(), container->windowHandle());
+}
+
 QTEST_MAIN(tst_QWindowContainer)
 
 #include "tst_qwindowcontainer.moc"