summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-07-06 08:39:09 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-07-12 21:25:22 +0000
commit34386672a58799d5ea7f1d9e6aa4b3896824b7f4 (patch)
tree505a33dedc7a74976c6a628f44fb3e0c6e7ddf76 /src/render
parent90dcce4f8703aa0bda39a9c642002ae3f16edf53 (diff)
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. Change-Id: I345658b0ab9c4edc070f6fd111fce135dd757b14 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 42f96fe2074bc63cfb8a4ae71a7262d554661da2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/render')
-rw-r--r--src/render/framegraph/qrendersurfaceselector.cpp2
-rw-r--r--src/render/texture/qtexture.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp
index 12a80e8ce..c374e993c 100644
--- a/src/render/framegraph/qrendersurfaceselector.cpp
+++ b/src/render/framegraph/qrendersurfaceselector.cpp
@@ -257,7 +257,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 45032ae7e..bfd7b4346 100644
--- a/src/render/texture/qtexture.cpp
+++ b/src/render/texture/qtexture.cpp
@@ -1514,8 +1514,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();
};