From c977e74afd18afff8729070f631e6b7a3f2887f5 Mon Sep 17 00:00:00 2001 From: Vitaly Fanaskov Date: Wed, 26 Feb 2020 15:22:40 +0100 Subject: QtConcurrent::run: accept more then five function's arguments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [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 Reviewed-by: Sona Kurazyan --- examples/vulkan/hellovulkancubes/renderer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/vulkan') 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 future = QtConcurrent::run(this, &Renderer::buildFrame); + QFuture future = QtConcurrent::run(&Renderer::buildFrame, this); m_frameWatcher.setFuture(future); } -- cgit v1.2.3