Fix quickwidgets with qt 6.7

KDAB · May 13, 2024 · b5fbe9a · b5fbe9a
1 parent dcb6af6
commit b5fbe9a
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/plugins/quickinspector/quickscreengrabber.cpp b/plugins/quickinspector/quickscreengrabber.cpp
@@ -21,6 +21,7 @@
 #include <QEvent>
 #include <QPainter>
 #include <QQuickWindow>
+#include <QQuickRenderControl>
 
 #ifndef QT_NO_OPENGL
 #include <QOpenGLContext>
@@ -626,10 +627,21 @@ void OpenGLScreenGrabber::windowAfterRendering()
         // to find the right x,y offsets to extract and show just our quick widget
         const bool isQQuickWidget = qstrcmp(m_window->metaObject()->className(), "QQuickWidgetOffscreenWindow") == 0;
         if (isQQuickWidget) {
+#if QT_VERSION <= QT_VERSION_CHECK(6, 6, 0)
             xOff = m_renderInfo.windowPosition.x();
             const auto windowBottom = (m_renderInfo.windowPosition.y() + m_renderInfo.windowSize.height());
             const auto viewportHeight = viewport[3];
             yOff = viewportHeight - windowBottom;
+#else
+            const auto windowBottom = m_renderInfo.windowSize.height();
+            const auto rc = QQuickWindowPrivate::get(m_window)->renderControl;
+            QPoint offset;
+            rc->renderWindow(&offset);
+
+            const auto viewportHeight = viewport[3];
+            yOff = viewportHeight - windowBottom - offset.y();
+            xOff = offset.x();
+#endif
         }
 #endif