1 files changed, 3 insertions, 13 deletions
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp
index f8973af2fb..c6b463bb02 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp
@@ -69,10 +69,6 @@ const QEvent::Type WM_Obscure           = QEvent::Type(QEvent::User + 1);
 // Passed from the RL to RT when GUI has been locked, waiting for sync.
 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 maybe release resource if no windows are
 // rendering.
 const QEvent::Type WM_TryRelease        = QEvent::Type(QEvent::User + 4);
@@ -296,7 +292,7 @@ bool QSGSoftwareRenderThread::event(QEvent *e)
                 QCoreApplication::processEvents();
                 QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
                 if (wme->destroying)
-                    delete wd->animationController;
+                    wd->animationController.reset();
             }
             if (wme->destroying)
                 active = false;
@@ -353,13 +349,6 @@ bool QSGSoftwareRenderThread::event(QEvent *e)
         return true;
     }
 
-    case WM_RequestRepaint:
-        qCDebug(QSG_RASTER_LOG_RENDERLOOP, "RT - WM_RequestPaint");
-        // When GUI posts this event, it is followed by a polishAndSync, so we
-        // must not exit the event loop yet.
-        pendingUpdate |= RepaintRequest;
-        break;
-
     default:
         break;
     }
@@ -855,7 +844,8 @@ void QSGSoftwareThreadedRenderLoop::handleExposure(QQuickWindow *window)
     if (!w->thread->isRunning()) {
         qCDebug(QSG_RASTER_LOG_RENDERLOOP, "starting render thread");
         // Push a few things to the render thread.
-        QQuickAnimatorController *controller = QQuickWindowPrivate::get(w->window)->animationController;
+        QQuickAnimatorController *controller
+                = QQuickWindowPrivate::get(w->window)->animationController.get();
         if (controller->thread() != w->thread)
             controller->moveToThread(w->thread);
         if (w->thread->thread() == QThread::currentThread()) {