diff options
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 09da575bc9..106fa7abd5 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -52,11 +52,11 @@ #include <string.h> +#include <type_traits> #ifndef QT_NO_EXCEPTIONS # include <exception> #endif // QT_NO_EXCEPTIONS - QT_BEGIN_NAMESPACE class QRegularExpression; @@ -204,11 +204,11 @@ do {\ return;\ } while (0) -#define QFETCH(type, name)\ - type name = *static_cast<type *>(QTest::qData(#name, ::qMetaTypeId<type >())) +#define QFETCH(Type, name)\ + Type name = *static_cast<Type *>(QTest::qData(#name, ::qMetaTypeId<typename std::remove_cv<Type >::type>())) -#define QFETCH_GLOBAL(type, name)\ - type name = *static_cast<type *>(QTest::qGlobalData(#name, ::qMetaTypeId<type >())) +#define QFETCH_GLOBAL(Type, name)\ + Type name = *static_cast<Type *>(QTest::qGlobalData(#name, ::qMetaTypeId<typename std::remove_cv<Type >::type>())) #define QTEST(actual, testElement)\ do {\ |