summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMÃ¥rten Nordheim <marten.nordheim@qt.io>2021-04-07 15:22:30 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-04-12 16:28:51 +0000
commit7a78d9bd1714e302e47fe7ea37e8179a05186873 (patch)
treefbfada9daa7a11532feb120b45b503618f4abbca
parentee9f20ccf363e8cfc53df8ce099f59c72b206a47 (diff)
QtConcurrentIterateKernel: fix warning
src\concurrent\qtconcurrentiteratekernel.cpp(134): warning C5055: operator '*': deprecated between enumerations and floating-point types Change-Id: I934e767e77e9393e1da3adc390dc8e252e7f5b6a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> (cherry picked from commit b86176abf6a66b20cebbcb53958229590b4c2253) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/concurrent/qtconcurrentiteratekernel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/concurrent/qtconcurrentiteratekernel.cpp b/src/concurrent/qtconcurrentiteratekernel.cpp
index 430ae89c85..268db56246 100644
--- a/src/concurrent/qtconcurrentiteratekernel.cpp
+++ b/src/concurrent/qtconcurrentiteratekernel.cpp
@@ -131,7 +131,7 @@ void BlockSizeManager::timeAfterUser()
if (controlPartElapsed.isMedianValid() == false)
return;
- if (controlPartElapsed.median() * TargetRatio < userPartElapsed.median())
+ if (controlPartElapsed.median() * int(TargetRatio) < userPartElapsed.median())
return;
m_blockSize = qMin(m_blockSize * 2, maxBlockSize);