2 files changed, 5 insertions, 8 deletions
diff --git a/tests/auto/testlib/selftests/extendedcompare/CMakeLists.txt b/tests/auto/testlib/selftests/extendedcompare/CMakeLists.txt
index 2975521060..3b2fbb84ec 100644
--- a/tests/auto/testlib/selftests/extendedcompare/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/extendedcompare/CMakeLists.txt
@@ -3,6 +3,7 @@
 
 qt_internal_add_executable(extendedcompare
     NO_INSTALL
+    EXCEPTIONS
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     SOURCES
         tst_extendedcompare.cpp
diff --git a/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp b/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp
index b6eb5c870c..70a7798667 100644
--- a/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp
+++ b/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QtCore/qtimer.h>
@@ -93,11 +93,13 @@ static ClassWithPointerGetter getClassForValue(int val)
 // various toString() overloads
 namespace QTest {
 
-char *toString(const int *val)
+template <> char *toString(const int *const &val)
 {
     return val ? toString(*val) : toString(nullptr);
 }
 
+} // namespace QTest
+
 char *toString(const MyClass &val)
 {
     char *msg = new char[128];
@@ -117,8 +119,6 @@ char *toString(const MyClass *val)
     return toString(nullptr);
 }
 
-} // namespace QTest
-
 enum MyUnregisteredEnum { MyUnregisteredEnumValue1, MyUnregisteredEnumValue2 };
 
 class tst_ExtendedCompare : public QObject
@@ -293,8 +293,6 @@ public:
     }
 };
 
-namespace QTest {
-
 char *toString(const ClassWithDeferredSetter &val)
 {
     char *msg = new char[128];
@@ -302,8 +300,6 @@ char *toString(const ClassWithDeferredSetter &val)
     return msg;
 }
 
-} // namespace QTest
-
 void tst_ExtendedCompare::checkComparisonWithTimeout()
 {
     QFETCH_GLOBAL(QTest::ComparisonOperation, operation);