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

Conflicts:
	src/widgets/kernel/qwidget_qpa.cpp
	src/widgets/widgets.pro

Change-Id: I697eec936c4e1a6c360edc8f0b472e23c0461ecb

2 files changed, 60 insertions, 1 deletions

diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index c3d2c4a9e7..cd9ff28891 100644
--- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
@@ -50,6 +50,7 @@
 #include <QVBoxLayout>
 #include <QSizeGrip>
 #include <QDesktopWidget>
+#include <QWindow>
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformtheme.h>
 #include <qpa/qplatformtheme_p.h>
@@ -85,6 +86,8 @@ private slots:
     void setVisible();
     void reject();
     void snapToDefaultButton();
+    void transientParent_data();
+    void transientParent();
 
 private:
     QDialog *testWidget;
@@ -584,5 +587,34 @@ void tst_QDialog::snapToDefaultButton()
 #endif // !QT_NO_CURSOR
 }
 
+void tst_QDialog::transientParent_data()
+{
+    QTest::addColumn<bool>("nativewidgets");
+    QTest::newRow("Non-native") << false;
+    QTest::newRow("Native") << true;
+}
+
+void tst_QDialog::transientParent()
+{
+    QFETCH(bool, nativewidgets);
+    testWidget->hide();
+    QWidget topLevel;
+    topLevel.resize(200, 200);
+    topLevel.move(QGuiApplication::primaryScreen()->availableGeometry().center() - QPoint(100, 100));
+    QVBoxLayout *layout = new QVBoxLayout(&topLevel);
+    QWidget *innerWidget = new QWidget(&topLevel);
+    layout->addWidget(innerWidget);
+    if (nativewidgets)
+        innerWidget->winId();
+    topLevel.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&topLevel));
+    QDialog dialog(innerWidget);
+    dialog.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&dialog));
+    // Transient parent should always be the top level, also when using
+    // native child widgets.
+    QCOMPARE(dialog.windowHandle()->transientParent(), topLevel.windowHandle());
+}
+
 QTEST_MAIN(tst_QDialog)
 #include "tst_qdialog.moc"
diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
index 8de3291207..d66a10ae56 100644
--- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -54,6 +54,8 @@
 #include <qtextedit.h>
 #include <qtreeview.h>
 #include <qlabel.h>
+#include <qdialog.h>
+#include <qscreen.h>
 #include <qdebug.h> // for file error messages
 
 QT_FORWARD_DECLARE_CLASS(QSplitter)
@@ -94,6 +96,8 @@ private slots:
     void taskQTBUG_4101_ensureOneNonCollapsedWidget_data();
     void taskQTBUG_4101_ensureOneNonCollapsedWidget();
     void setLayout();
+    void autoAdd();
+
 private:
     void removeThirdWidget();
     void addThirdWidget();
@@ -781,5 +785,28 @@ void tst_QSplitter::setLayout()
     QCOMPARE(splitter.layout(), &layout);
 }
 
+void tst_QSplitter::autoAdd()
+{
+    QSplitter splitter;
+    splitter.setWindowTitle("autoAdd");
+    splitter.setMinimumSize(QSize(200, 200));
+    splitter.move(QGuiApplication::primaryScreen()->availableGeometry().center() - QPoint(100, 100));
+    splitter.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&splitter));
+    // Constructing a child widget on the splitter should
+    // automatically add and show it.
+    QWidget *childWidget = new QWidget(&splitter);
+    QCOMPARE(splitter.count(), 1);
+    QTRY_VERIFY(childWidget->isVisible());
+    // Deleting should automatically remove it
+    delete childWidget;
+    QCOMPARE(splitter.count(), 0);
+    // QTBUG-40132, top level windows should not be affected by this.
+    QDialog *dialog = new QDialog(&splitter);
+    QCOMPARE(splitter.count(), 0);
+    QCoreApplication::processEvents();
+    QVERIFY(!dialog->isVisible());
+}
+
 QTEST_MAIN(tst_QSplitter)
 #include "tst_qsplitter.moc"