whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QScopeGuard: Fix build by giving template parameters explicitly 

std::function does not have deduction guides in older libc++ (presumably older
than version 10). Omitting the template parameter isn't essential for the test,
so just give it.

Change-Id: Ia9bb91f961b0928203737ec976913effd06433e0
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
bb10
Kari Oikarinen 2020-02-25 17:23:48 +02:00
parent 3f9862db95
commit 9ead0b0431
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
View File

@ -100,8 +100,8 @@ void tst_QScopeGuard::construction()
QScopeGuard fromFunctionPointer(&func);
QScopeGuard fromNonVoidFunction(intFunc);
QScopeGuard fromNoDiscardFunction(noDiscardFunc);
QScopeGuard fromStdFunction{std::function(func)};
std::function stdFunction(func);
QScopeGuard fromStdFunction{std::function<void()>(func)};
std::function<void()> stdFunction(func);
QScopeGuard fromNamedStdFunction(stdFunction);
#else
QSKIP("This test requires C++17 Class Template Argument Deduction support enabled in the compiler.");