1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with C++20

Browse Source 
Implicit capture of 'this' in [=] is deprecated in C++20.

Fix by using explicit captures.

Change-Id: Ie3a94ec60d7c56b2856d201fa3d68d0670bdd7b9
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2019-07-06 21:05:32 +02:00
parent 32b338a8dc
commit 4d2c78dae4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -670,7 +670,7 @@ bool QWaylandWindow::waitForFrameSync(int timeout)
// started by other writes // started by other writes
int fcbId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1); int fcbId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1);
if (fcbId != -1) if (fcbId != -1)
QMetaObject::invokeMethod(this, [=] { killTimer(fcbId); }, Qt::QueuedConnection); QMetaObject::invokeMethod(this, [this, fcbId] { killTimer(fcbId); }, Qt::QueuedConnection);
return !mWaitingForFrameCallback; return !mWaitingForFrameCallback;
} }
@ -1157,7 +1157,7 @@ void QWaylandWindow::handleUpdate()
// ignore it if it times out before it's cleaned up by the invokeMethod call. // ignore it if it times out before it's cleaned up by the invokeMethod call.
int id = mFallbackUpdateTimerId; int id = mFallbackUpdateTimerId;
mFallbackUpdateTimerId = -1; mFallbackUpdateTimerId = -1;
QMetaObject::invokeMethod(this, [=] { killTimer(id); }, Qt::QueuedConnection); QMetaObject::invokeMethod(this, [this, id] { killTimer(id); }, Qt::QueuedConnection);
} }
mFrameCallback = frame(); mFrameCallback = frame();
@ -1168,10 +1168,10 @@ void QWaylandWindow::handleUpdate()
// Stop current frame timer if any, can't use killTimer directly, see comment above. // Stop current frame timer if any, can't use killTimer directly, see comment above.
int fcbId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1); int fcbId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1);
if (fcbId != -1) if (fcbId != -1)
QMetaObject::invokeMethod(this, [=] { killTimer(fcbId); }, Qt::QueuedConnection); QMetaObject::invokeMethod(this, [this, fcbId] { killTimer(fcbId); }, Qt::QueuedConnection);
// Start a timer for handling the case when the compositor stops sending frame callbacks. // Start a timer for handling the case when the compositor stops sending frame callbacks.
QMetaObject::invokeMethod(this, [=] { // Again; can't do it directly QMetaObject::invokeMethod(this, [this] { // Again; can't do it directly
if (mWaitingForFrameCallback) if (mWaitingForFrameCallback)
mFrameCallbackTimerId = startTimer(100); mFrameCallbackTimerId = startTimer(100);
}, Qt::QueuedConnection); }, Qt::QueuedConnection);