diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-21 09:53:40 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-22 23:23:14 +0000 |
| commit | b857b0ebe7333654d892c7660974307089fd3f5a (patch) | |
| tree | 48205750b1700cc5aa312ade14f5fc1670be725a | |
| parent | 6e97c60be7cebb0ff861d5b245e0fc2e64b35562 (diff) | |
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>
| -rw-r--r-- | src/testlib/qtestcase.cpp | 5 | ||||
| -rw-r--r-- | src/testlib/qtestcase.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 9bf202cca7..8e2f996b4e 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]; diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 02c1267a60..b9d64a4309 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -283,7 +283,8 @@ namespace QTest Q_TESTLIB_EXPORT char *toPrettyCString(const char *unicode, int length); Q_TESTLIB_EXPORT char *toPrettyUnicode(QStringView string); Q_TESTLIB_EXPORT char *toString(const char *); - Q_TESTLIB_EXPORT char *toString(const void *); + Q_TESTLIB_EXPORT char *toString(const volatile void *); + Q_TESTLIB_EXPORT char *toString(const void *); // ### FIXME: Qt 7: Remove Q_TESTLIB_EXPORT void qInit(QObject *testObject, int argc = 0, char **argv = nullptr); Q_TESTLIB_EXPORT int qRun(); |