1 files changed, 34 insertions, 7 deletions

diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index fe74268481..045431fcaf 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -52,18 +52,18 @@
 
 #include <string.h>
 
+#include <type_traits>
 #ifndef QT_NO_EXCEPTIONS
 #  include <exception>
 #endif // QT_NO_EXCEPTIONS
 
-
 QT_BEGIN_NAMESPACE
 
 class QRegularExpression;
 
 #define QVERIFY(statement) \
 do {\
-    if (!QTest::qVerify((statement), #statement, "", __FILE__, __LINE__))\
+    if (!QTest::qVerify(static_cast<bool>(statement), #statement, "", __FILE__, __LINE__))\
         return;\
 } while (0)
 
@@ -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 {\
@@ -332,13 +332,27 @@ namespace QTest
     Q_TESTLIB_EXPORT bool qCompare(double const &t1, double const &t2,
                     const char *actual, const char *expected, const char *file, int line);
 
-    inline bool compare_ptr_helper(const void *t1, const void *t2, const char *actual,
+    inline bool compare_ptr_helper(const volatile void *t1, const volatile void *t2, const char *actual,
                                    const char *expected, const char *file, int line)
     {
         return compare_helper(t1 == t2, "Compared pointers are not the same",
                               toString(t1), toString(t2), actual, expected, file, line);
     }
 
+    inline bool compare_ptr_helper(const volatile void *t1, std::nullptr_t, const char *actual,
+                                   const char *expected, const char *file, int line)
+    {
+        return compare_helper(t1 == nullptr, "Compared pointers are not the same",
+                              toString(t1), toString(nullptr), actual, expected, file, line);
+    }
+
+    inline bool compare_ptr_helper(std::nullptr_t, const volatile void *t2, const char *actual,
+                                   const char *expected, const char *file, int line)
+    {
+        return compare_helper(nullptr == t2, "Compared pointers are not the same",
+                              toString(nullptr), toString(t2), actual, expected, file, line);
+    }
+
     Q_TESTLIB_EXPORT bool compare_string_helper(const char *t1, const char *t2, const char *actual,
                                       const char *expected, const char *file, int line);
 
@@ -388,6 +402,19 @@ namespace QTest
         return compare_ptr_helper(t1, t2, actual, expected, file, line);
     }
 
+    template <typename T>
+    inline bool qCompare(T *t1, std::nullptr_t, const char *actual, const char *expected,
+                        const char *file, int line)
+    {
+        return compare_ptr_helper(t1, nullptr, actual, expected, file, line);
+    }
+    template <typename T>
+    inline bool qCompare(std::nullptr_t, T *t2, const char *actual, const char *expected,
+                        const char *file, int line)
+    {
+        return compare_ptr_helper(nullptr, t2, actual, expected, file, line);
+    }
+
     template <typename T1, typename T2>
     inline bool qCompare(const T1 *t1, const T2 *t2, const char *actual, const char *expected,
                         const char *file, int line)