From b857b0ebe7333654d892c7660974307089fd3f5a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 21 May 2021 09:53:40 +0200
Subject: QTestlib: Fix formatting of pointers in QCOMPARE

After 1ed8a7bff503aacf55f7f880ddaad461ea15e5e1,
volatile needs to be specified for toString(), else it is not
used by compare_ptr_helper(). Add an overload.

Change-Id: I3c335f324df346233623272d1014c8360ca33160
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 6fff7bb2692ecda1cff8624f5eccc0a2528fb693)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/testlib/qtestcase.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/testlib/qtestcase.cpp')

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 9bf202cca71..8e2f996b4e0 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -2798,6 +2798,11 @@ char *QTest::toString(const char *str)
 
 /*! \internal
  */
+char *QTest::toString(const volatile void *p) // Use volatile to match compare_ptr_helper()
+{
+    return QTest::toString(const_cast<const void *>(p));
+}
+
 char *QTest::toString(const void *p)
 {
     char *msg = new char[128];
-- 
cgit v1.2.3