Fix various [=] lambda captures to capture [this] instead

C++20 deprecated the implicit capture of [this] in [=].

Move Q_D()s into the lambdas, where applicable.

Pick-to: 6.4 6.3 6.2 5.15
Change-Id: I345658b0ab9c4edc070f6fd111fce135dd757b14
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 5 insertions, 4 deletions

diff --git a/src/extras/defaults/qabstractcameracontroller.cpp b/src/extras/defaults/qabstractcameracontroller.cpp
index 48e381584..f3eb03f00 100644
--- a/src/extras/defaults/qabstractcameracontroller.cpp
+++ b/src/extras/defaults/qabstractcameracontroller.cpp
@@ -252,7 +252,8 @@ QAbstractCameraController::QAbstractCameraController(QAbstractCameraControllerPr
     d->init();
 
     QObject::connect(d->m_frameAction, &Qt3DLogic::QFrameAction::triggered,
-                     this, [=] (float dt) {
+                     this, [this] (float dt) {
+        Q_D(const QAbstractCameraController);
         InputState  state;
 
         state.rxAxisValue = d->m_rxAxis->value();
diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp
index d8337b67a..0f0339b8f 100644
--- a/src/render/framegraph/qrendersurfaceselector.cpp
+++ b/src/render/framegraph/qrendersurfaceselector.cpp
@@ -220,7 +220,7 @@ void QRenderSurfaceSelector::setSurface(QObject *surfaceObject)
                 d->m_heightConn = QObject::connect(window, &QWindow::heightChanged, [=] (int) {
                     d->update();
                 });
-                d->m_screenConn = QObject::connect(window, &QWindow::screenChanged, [=] (QScreen *screen) {
+                d->m_screenConn = QObject::connect(window, &QWindow::screenChanged, [this] (QScreen *screen) {
                     if (screen && !qFuzzyCompare(surfacePixelRatio(), float(screen->devicePixelRatio())))
                         setSurfacePixelRatio(float(screen->devicePixelRatio()));
                 });
diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp
index 2ace08576..6854057a2 100644
--- a/src/render/texture/qtexture.cpp
+++ b/src/render/texture/qtexture.cpp
@@ -1478,8 +1478,8 @@ QTextureLoader::QTextureLoader(QNode *parent)
 
     // Regenerate the texture functor when properties we support overriding
     // from QAbstractTexture get changed.
-    Q_D(QTextureLoader);
-    auto regenerate = [=] () {
+    auto regenerate = [this] () {
+        Q_D(QTextureLoader);
         if (!notificationsBlocked())    // check the change doesn't come from the backend
             d->updateGenerator();
     };