From bb7e3e2dd71490eeffbfc12b7ee2a9d4c8b70f07 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Sun, 28 Aug 2016 20:17:24 +0200
Subject: QTest: allow to mark QFETCH variables const

[ChangeLog][QtTest] QFETCH variables can now be declared const (QFETCH(const T, name)).

Change-Id: I7cc1e4568d7082f27f90d8b5abf53ffafb1c48c7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/testlib/qtestcase.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/testlib')

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 {\
-- 
cgit v1.2.3