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

Change-Id: I83ff8f4d7dffd7385013a1bd8a1732a89ee20d56

2 files changed, 0 insertions, 32 deletions

diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 7bb5fd4614..03d6c1cdbd 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -7192,10 +7192,6 @@ void tst_QWidget::hideOpaqueChildWhileHidden()
 #if !defined(Q_OS_WINCE)
 void tst_QWidget::updateWhileMinimized()
 {
-#ifdef Q_OS_UNIX
-    if (qgetenv("XDG_CURRENT_DESKTOP").contains("Unity"))
-        QSKIP("This test fails on Unity."); // Minimized windows are not unmapped for some reason.
-#endif // Q_OS_UNIX
     UpdateWidget widget;
    // Filter out activation change and focus events to avoid update() calls in QWidget.
     widget.updateOnActivationChangeAndFocusIn = false;
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 f5585c583a..1bbbfd610e 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -91,8 +91,6 @@ private slots:
     void tst_showWithoutActivating();
     void tst_paintEventOnSecondShow();
 
-    void obscuredNativeMapped();
-
 #ifndef QT_NO_DRAGANDDROP
     void tst_dnd();
 #endif
@@ -370,32 +368,6 @@ void tst_QWidget_window::tst_paintEventOnSecondShow()
     QTRY_VERIFY(w.paintEventReceived);
 }
 
-// QTBUG-33520, a toplevel fully obscured by native children should still receive Qt::WA_Mapped
-void tst_QWidget_window::obscuredNativeMapped()
-{
-    enum { size = 200 };
-
-    QWidget topLevel;
-    topLevel.setWindowFlags(Qt::FramelessWindowHint);
-    QWidget *child = new QWidget(&topLevel);
-    child->resize(size, size);
-    topLevel.resize(size, size);
-    topLevel.move(QGuiApplication::primaryScreen()->availableGeometry().center() - QPoint(size /2 , size / 2));
-    child->winId();
-    topLevel.show();
-    QTRY_VERIFY(topLevel.testAttribute(Qt::WA_Mapped));
-#if defined(Q_OS_MAC)
-    QSKIP("This test fails on Mac."); // Minimized windows are not unmapped for some reason.
-#elif defined(Q_OS_UNIX)
-    if (qgetenv("XDG_CURRENT_DESKTOP").contains("Unity"))
-        QSKIP("This test fails on Unity."); // Minimized windows are not unmapped for some reason.
-#endif // Q_OS_UNIX
-    topLevel.setWindowState(Qt::WindowMinimized);
-    QTRY_VERIFY(!topLevel.testAttribute(Qt::WA_Mapped));
-    topLevel.setWindowState(Qt::WindowNoState);
-    QTRY_VERIFY(topLevel.testAttribute(Qt::WA_Mapped));
-}
-
 #ifndef QT_NO_DRAGANDDROP
 
 /* DnD test for QWidgetWindow (handleDrag*Event() functions).