Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl

Change-Id: I81f01dbde95cc9cd8e98c7fb9bf3a390aa27f379

1 files changed, 5 insertions, 7 deletions

diff --git a/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp b/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp
index 387c5ff8d..870eb2cd0 100644
--- a/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp
+++ b/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp
@@ -39,19 +39,13 @@
 
 #include "renderviewbuilder_p.h"
 #include <Qt3DRender/private/qrenderaspect_p.h>
-
-#include <QThread>
+#include <Qt3DCore/private/qaspectjobmanager_p.h>
 
 namespace Qt3DRender {
 
 namespace Render {
 namespace Rhi {
 
-// In some cases having less jobs is better (especially on fast cpus where
-// splitting just adds more overhead). Ideally, we should try to set the value
-// depending on the platform/CPU/nbr of cores
-const int RenderViewBuilder::m_optimalParallelJobCount = QThread::idealThreadCount();
-
 namespace {
 
 int findIdealNumberOfWorkers(int elementCount, int packetSize = 100)
@@ -498,6 +492,10 @@ RenderViewBuilder::RenderViewBuilder(Render::FrameGraphNode *leafNode, int rende
       m_syncFilterEntityByLayerJob(),
       m_filterProximityJob(Render::FilterProximityDistanceJobPtr::create())
 {
+    // In some cases having less jobs is better (especially on fast cpus where
+    // splitting just adds more overhead). Ideally, we should try to set the value
+    // depending on the platform/CPU/nbr of cores
+    m_optimalParallelJobCount = Qt3DCore::QAspectJobManager::idealThreadCount();
 }
 
 RenderViewInitializerJobPtr RenderViewBuilder::renderViewJob() const