summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorVitaly Fanaskov <vitaly.fanaskov@qt.io>2020-02-26 15:22:40 +0100
committerVitaly Fanaskov <vitaly.fanaskov@qt.io>2020-03-11 14:46:25 +0100
commitc977e74afd18afff8729070f631e6b7a3f2887f5 (patch)
tree08be91368aaee6391e1fcb71f67f90708f7b9e7a /examples
parent01bacdf7abb071198d843acdfb22ce1701766be8 (diff)
QtConcurrent::run: accept more then five function's arguments
[ChangeLog][Potentially Source-Incompatible Changes] QtConcurrent::run has the following signatures: run(Function &&f, Args &&...args) and run(QThreadPool *pool, Function &&f, Args &&...args). If f is a member pointer, the first argument of args should be an object for which that member is defined (or a reference, or a pointer to it). See the documentation for more details. Fixes: QTBUG-82383 Change-Id: I18f7fcfb2adbdd9f75b29c346bd3516304e32d31 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/vulkan/hellovulkancubes/renderer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/vulkan/hellovulkancubes/renderer.cpp b/examples/vulkan/hellovulkancubes/renderer.cpp
index f104d79002..da493de739 100644
--- a/examples/vulkan/hellovulkancubes/renderer.cpp
+++ b/examples/vulkan/hellovulkancubes/renderer.cpp
@@ -136,7 +136,7 @@ void Renderer::initResources()
if (!m_floorMaterial.fs.isValid())
m_floorMaterial.fs.load(inst, dev, QStringLiteral(":/color_frag.spv"));
- m_pipelinesFuture = QtConcurrent::run(this, &Renderer::createPipelines);
+ m_pipelinesFuture = QtConcurrent::run(&Renderer::createPipelines, this);
}
void Renderer::createPipelines()
@@ -879,7 +879,7 @@ void Renderer::startNextFrame()
// finished.
Q_ASSERT(!m_framePending);
m_framePending = true;
- QFuture<void> future = QtConcurrent::run(this, &Renderer::buildFrame);
+ QFuture<void> future = QtConcurrent::run(&Renderer::buildFrame, this);
m_frameWatcher.setFuture(future);
}