1 files changed, 58 insertions, 13 deletions

diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
index 07cce4cdc3..51f898c953 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
+++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QtOpenGLWidgets/QOpenGLWidget>
 #include <QtGui/QOpenGLFunctions>
@@ -24,8 +24,7 @@
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformbackingstore.h>
 #include <qpa/qplatformintegration.h>
-#include <private/qrhi_p.h>
-#include <private/qrhigles2_p.h>
+#include <rhi/qrhi.h>
 
 class tst_QOpenGLWidget : public QObject
 {
@@ -204,7 +203,7 @@ void tst_QOpenGLWidget::deviceLoss()
     w->resize(640, 480);
     w->show();
 
-    auto rhi = w->backingStore()->handle()->rhi();
+    auto rhi = w->backingStore()->handle()->rhi(w->windowHandle());
     QNativeInterface::QEGLContext *rhiContext = nullptr;
     if (rhi->backend() == QRhi::OpenGLES2) {
         auto rhiHandles = static_cast<const QRhiGles2NativeHandles *>(rhi->nativeHandles());
@@ -327,10 +326,6 @@ void tst_QOpenGLWidget::reparentToNotYetCreated()
 
 void tst_QOpenGLWidget::reparentHidden()
 {
-#ifdef Q_OS_ANDROID
-    if (QNativeInterface::QAndroidApplication::sdkVersion() >= 31)
-        QSKIP("Fails on Android 12 (QTBUG-111235)");
-#endif
     // Tests QTBUG-60896
     QWidget topLevel1;
 
@@ -574,6 +569,21 @@ void tst_QOpenGLWidget::showHide()
     QVERIFY(image.pixel(30, 40) == qRgb(0, 0, 255));
 }
 
+QtMessageHandler oldHandler = nullptr;
+
+void nativeWindowMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    if (oldHandler)
+        oldHandler(type, context, msg);
+
+    if (type == QtWarningMsg
+        && (msg.contains("QOpenGLContext::makeCurrent() called with non-opengl surface")
+            || msg.contains("Failed to make context current")))
+    {
+        QFAIL("Unexpected warning got printed");
+    }
+}
+
 void tst_QOpenGLWidget::nativeWindow()
 {
 #ifdef Q_OS_ANDROID
@@ -585,6 +595,10 @@ void tst_QOpenGLWidget::nativeWindow()
     // presented correctly as we can only do verification with
     // grabFramebuffer() here which only exercises a part of the pipeline.
 
+    // Install a message handler that looks for some typical warnings from
+    // QRhi/QOpenGLConext that occur when the RHI-related logic in widgets goes wrong.
+    oldHandler = qInstallMessageHandler(nativeWindowMessageHandler);
+
     {
         QScopedPointer<ClearWidget> w(new ClearWidget(nullptr, 800, 600));
         w->resize(800, 600);
@@ -600,7 +614,33 @@ void tst_QOpenGLWidget::nativeWindow()
         QVERIFY(w->internalWinId());
     }
 
-    // Now as a native child
+    // QTBUG-113557: a plain _raster_ QWidget that is a _native_ child in a toplevel
+    // combined with a RHI-based (non-native) widget (QOpenGLWidget in this case)
+    // in the same toplevel.
+    {
+        QWidget topLevel;
+        topLevel.resize(800, 600);
+
+        ClearWidget *child = new ClearWidget(&topLevel, 800, 600);
+        child->setClearColor(1, 0, 0);
+        child->resize(400, 400);
+        child->move(23, 34);
+
+        QWidget *raster = new QWidget(&topLevel);
+        raster->setGeometry(23, 240, 120, 120);
+        raster->setStyleSheet("QWidget { background-color: yellow; }");
+
+        raster->winId();
+
+        topLevel.show();
+        QVERIFY(QTest::qWaitForWindowExposed(&topLevel));
+
+        // Do not bother checking the output, i.e. if the yellow raster native child
+        // shows up as it should, but rather rely on the message handler catching the
+        // qWarnings if they occur.
+    }
+
+    // Now with the QOpenGLWidget being a native child
     {
         QWidget topLevel;
         topLevel.resize(800, 600);
@@ -666,7 +706,7 @@ void tst_QOpenGLWidget::nativeWindow()
         ClearWidget *child = new ClearWidget(nullptr, 800, 600);
         // set the parent separately, this is important, see next test case
         child->setParent(container);
-        child->setClearColor(0, 1, 0);
+        child->setClearColor(0, 0, 1);
         child->resize(400, 400);
         child->move(23, 34);
 
@@ -680,7 +720,7 @@ void tst_QOpenGLWidget::nativeWindow()
         QImage image = child->grabFramebuffer();
         QCOMPARE(image.width(), child->width());
         QCOMPARE(image.height(), child->height());
-        QVERIFY(image.pixel(30, 40) == qRgb(0, 255, 0));
+        QVERIFY(image.pixel(30, 40) == qRgb(0, 0, 255));
     }
 
     // Again as a child of a native child, but this time specifying the parent
@@ -692,7 +732,7 @@ void tst_QOpenGLWidget::nativeWindow()
         container->winId();
         // parent it right away
         ClearWidget *child = new ClearWidget(container, 800, 600);
-        child->setClearColor(0, 1, 0);
+        child->setClearColor(0, 0, 1);
         child->resize(400, 400);
         child->move(23, 34);
         topLevel.show();
@@ -703,7 +743,12 @@ void tst_QOpenGLWidget::nativeWindow()
         QImage image = child->grabFramebuffer();
         QCOMPARE(image.width(), child->width());
         QCOMPARE(image.height(), child->height());
-        QVERIFY(image.pixel(30, 40) == qRgb(0, 255, 0));
+        QVERIFY(image.pixel(30, 40) == qRgb(0, 0, 255));
+    }
+
+    if (oldHandler) {
+        qInstallMessageHandler(oldHandler);
+        oldHandler = nullptr;
     }
 }