Merge remote-tracking branch 'origin/api_changes'

Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1

3 files changed, 14 insertions, 39 deletions

diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index 764d777cea..647376412f 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -52,6 +52,7 @@
 #include <QtWidgets/QFrame>
 #include <QtWidgets/QWindowsStyle>
 #include <QtWidgets/QSizePolicy>
+#include <QtWidgets/QComboBox>
 #include <QPushButton>
 #include <QRadioButton>
 #include <private/qlayoutengine_p.h>
@@ -77,6 +78,7 @@ private slots:
     void layoutItemRect();
     void warnIfWrongParent();
     void controlTypes();
+    void controlTypes2();
     void adjustSizeShouldMakeSureLayoutIsActivated();
 };
 
@@ -310,7 +312,16 @@ void tst_QLayout::controlTypes()
     QCOMPARE(layout.controlTypes(), QSizePolicy::DefaultType);
     QSizePolicy p;
     QCOMPARE(p.controlType(),QSizePolicy::DefaultType);
+}
 
+void tst_QLayout::controlTypes2()
+{
+    QWidget main;
+    QVBoxLayout *const layout = new QVBoxLayout(&main);
+    layout->setMargin(0);
+    QComboBox *combo = new QComboBox(&main);
+    layout->addWidget(combo);
+    QCOMPARE(layout->controlTypes(), QSizePolicy::ComboBox);
 }
 
 void tst_QLayout::adjustSizeShouldMakeSureLayoutIsActivated()
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 975c88db05..0c769d55da 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -377,9 +377,6 @@ private slots:
 #endif
     void windowFlags();
     void initialPosForDontShowOnScreenWidgets();
-#ifdef Q_WS_X11
-    void paintOutsidePaintEvent();
-#endif
     void updateOnDestroyedSignal();
     void toplevelLineEditFocus();
     void inputFocus_task257832();
@@ -8711,42 +8708,6 @@ void tst_QWidget::initialPosForDontShowOnScreenWidgets()
     }
 }
 
-#ifdef Q_WS_X11
-void tst_QWidget::paintOutsidePaintEvent()
-{
-    QWidget widget;
-    widget.resize(200, 200);
-
-    QWidget child1(&widget);
-    child1.resize(100, 100);
-    child1.setPalette(Qt::red);
-    child1.setAutoFillBackground(true);
-
-    QWidget child2(&widget);
-    child2.setGeometry(50, 50, 100, 100);
-    child2.setPalette(Qt::blue);
-    child2.setAutoFillBackground(true);
-
-    widget.show();
-    QTest::qWaitForWindowShown(&widget);
-    QTest::qWait(60);
-
-    const QPixmap before = QPixmap::grabWindow(widget.winId());
-
-    // Child 1 should be clipped by child 2, so nothing should change.
-    child1.setAttribute(Qt::WA_PaintOutsidePaintEvent);
-    QPainter painter(&child1);
-    painter.fillRect(child1.rect(), Qt::red);
-    painter.end();
-    XSync(QX11Info::display(), false); // Flush output buffer.
-    QTest::qWait(60);
-
-    const QPixmap after = QPixmap::grabWindow(widget.winId());
-
-    QCOMPARE(before, after);
-}
-#endif
-
 class MyEvilObject : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
index 78d9d36bc9..be33381620 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -91,6 +91,9 @@ void tst_QWidget_window::cleanupTestCase()
 
 void tst_QWidget_window::tst_move_show()
 {
+#ifdef Q_OS_WIN
+    QSKIP("QTBUG-25331");
+#endif
     QWidget w;
     w.move(100, 100);
     w.show();