summaryrefslogtreecommitdiffstats
path: root/src/render/raycasting/qraycastingservice.cpp
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-04-27 11:56:17 +0100
committerPaul Lemire <paul.lemire@kdab.com>2020-05-06 15:29:54 +0200
commit764924da8ab3255c1b8d1ad5b39f85675f4b855e (patch)
treec7b3e9d94318fd347ef2717feb5b539f5c18ff13 /src/render/raycasting/qraycastingservice.cpp
parent9838d91e2d433f13c57bdae48e31ba0b909988aa (diff)
Fix build for Qt6
- updated dependencies, excluding qtgamepad for now - fixed issues with Q_PROPERTY not supporting forward declarations - fixed for changes in QtQuick private API - fixed for changes in QtOpenGLVersionFunctions API - fixed for removal of QT_OPENGL_ES* macros - fixed for changes in QtConcurrent API - fixed RHI based build Change-Id: I42ccd2f101b7f0a78e2860c6d551722bf6710a11 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/raycasting/qraycastingservice.cpp')
-rw-r--r--src/render/raycasting/qraycastingservice.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/render/raycasting/qraycastingservice.cpp b/src/render/raycasting/qraycastingservice.cpp
index bdb1557f7..e9a88e3a3 100644
--- a/src/render/raycasting/qraycastingservice.cpp
+++ b/src/render/raycasting/qraycastingservice.cpp
@@ -194,8 +194,9 @@ QQueryHandle QRayCastingService::query(const QRay3D &ray,
// Blocking mapReduce
#if QT_CONFIG(concurrent)
- FutureQueryResult future = QtConcurrent::run(d, &QRayCastingServicePrivate::collides,
- ray, provider, mode, handle);
+ FutureQueryResult future = QtConcurrent::run([d, ray, provider, mode, handle]{
+ return d->collides(ray, provider, mode, handle);
+ });
d->m_results.insert(handle, future);
#else
d->m_results.insert(handle, d->collides(ray, provider, mode, handle));