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

Change-Id: I8b5a10d897a926078895ae41f48cdbd2474902b8

1 files changed, 0 insertions, 21 deletions

diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
index dfe5baba71..a1cb729849 100644
--- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -52,7 +52,6 @@ private slots:
     void boundingRect2();
     void draw();
     void opacity();
-    void nestedOpaqueOpacity();
     void grayscale();
     void colorize();
     void drawPixmapItem();
@@ -408,26 +407,6 @@ void tst_QGraphicsEffect::opacity()
     QCOMPARE(effect->m_opacity, qreal(0.5));
 }
 
-void tst_QGraphicsEffect::nestedOpaqueOpacity()
-{
-    // QTBUG-60231: Nesting widgets with a QGraphicsEffect on a toplevel with
-    // QGraphicsOpacityEffect caused crashes due to constructing several
-    // QPainter instances on a device in the fast path for
-    // QGraphicsOpacityEffect::opacity=1
-    QWidget topLevel;
-    topLevel.setWindowTitle(QTest::currentTestFunction());
-    topLevel.resize(320, 200);
-    QGraphicsOpacityEffect *opacityEffect = new QGraphicsOpacityEffect;
-    opacityEffect->setOpacity(1);
-    topLevel.setGraphicsEffect(opacityEffect);
-    QWidget *child = new QWidget(&topLevel);
-    child->resize(topLevel.size() / 2);
-    QGraphicsDropShadowEffect *childEffect = new QGraphicsDropShadowEffect;
-    child->setGraphicsEffect(childEffect);
-    topLevel.show();
-    QVERIFY(QTest::qWaitForWindowExposed(&topLevel));
-}
-
 void tst_QGraphicsEffect::grayscale()
 {
     if (qApp->desktop()->depth() < 24)