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

QTest: fix QCOMPARE with QT_TYPESAFE_FLAGS 

Amends 631a0cc45c.

Pick-to: 6.3
Fixes: QTBUG-101299
Change-Id: Ib17e405de4db9fb592aba4ea842d3768a95cad74
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Marc Mutz 2022-02-25 17:53:02 +01:00
parent 586fd9e034
commit ea3a7aaf2b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testlib/qtest.h
View File

@ -503,14 +503,16 @@ template <typename T>
inline bool qCompare(QFlags<T> const &t1, T const &t2, const char *actual, const char *expected,
const char *file, int line)
{
return qCompare(int(t1), int(t2), actual, expected, file, line);
using Int = typename QFlags<T>::Int;
return qCompare(Int(t1), Int(t2), actual, expected, file, line);
}
template <typename T>
inline bool qCompare(QFlags<T> const &t1, int const &t2, const char *actual, const char *expected,
const char *file, int line)
{
return qCompare(int(t1), t2, actual, expected, file, line);
using Int = typename QFlags<T>::Int;
return qCompare(Int(t1), Int(t2), actual, expected, file, line);
}
template<>