1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFuture: avoid warnings about unreachable code with /W4 in MSVC

Browse Source 
... when instantiating the MetaTypeQFutureHelper for QFuture<void>.

Simply enabling /W4 for tst_qfuture also generates this warning, but
also much more. So I'm not providing any unit-test here.

Amends 90d9a86c2e762c9426d0facbd54ed5dbff574ecd.

Fixes: QTBUG-133406
Change-Id: I22a53b872818763b80f333f597ddd19a1c1e30ac
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit ff6bf61b17ee4fc8ca11e016242d7c3399a02045)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7a7c7322fa820425aa4896bb15172e922dc974ea)
This commit is contained in:
Ivan Solovev 2025-03-04 16:15:59 +01:00 committed by Qt Cherry-pick Bot
parent b918224987
commit 52b46a7c46
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/thread/qfuture.h
View File

@ -437,11 +437,12 @@ template<typename T>
struct MetaTypeQFutureHelper<QFuture<T>>
{
static bool registerConverter() {
if constexpr (std::is_same_v<T, void>)
if constexpr (std::is_same_v<T, void>) {
return false;
return QMetaType::registerConverter<QFuture<T>, QFuture<void>>(
[](const QFuture<T> &future) { return QFuture<void>(future); });
} else {
return QMetaType::registerConverter<QFuture<T>, QFuture<void>>(
[](const QFuture<T> &future) { return QFuture<void>(future); });
}
}
};