Merge remote-tracking branch 'origin/dev' into wip/qt6wip/qt6

Conflicts:
	.qmake.conf
	src/qml/qml/qqmlengine.cpp
	src/qmlmodels/qqmlmodelsmodule.cpp

Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404

1 files changed, 0 insertions, 11 deletions

diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index d1258cf903..9e34a2b201 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -147,10 +147,6 @@ const QEvent::Type WM_Obscure           = QEvent::Type(QEvent::User + 1);
 // (updatePaintNode())
 const QEvent::Type WM_RequestSync       = QEvent::Type(QEvent::User + 2);
 
-// Passed by the RT to itself to trigger another render pass. This is
-// typically a result of QQuickWindow::update().
-const QEvent::Type WM_RequestRepaint    = QEvent::Type(QEvent::User + 3);
-
 // Passed by the RL to the RT to free up maybe release SG and GL contexts
 // if no windows are rendering.
 const QEvent::Type WM_TryRelease        = QEvent::Type(QEvent::User + 4);
@@ -510,13 +506,6 @@ bool QSGRenderThread::event(QEvent *e)
         return true;
     }
 
-    case WM_RequestRepaint:
-        qCDebug(QSG_LOG_RENDERLOOP, QSG_RT_PAD, "WM_RequestPaint");
-        // When GUI posts this event, it is followed by a polishAndSync, so we mustn't
-        // exit the event loop yet.
-        pendingUpdate |= RepaintRequest;
-        break;
-
     default:
         break;
     }