1 files changed, 6 insertions, 7 deletions
diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
index 589b98ce49..bae3e6eed6 100644
--- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp
+++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
@@ -422,7 +422,12 @@ void tst_QMap::beginEnd()
     // detach
     map2.insert( "2", "c" );
     QVERIFY( map.constBegin() == map.constBegin() );
-    QVERIFY( map.constBegin() != map2.constBegin() );
+
+    // comparing iterators between two different std::map is UB (and raises an
+    // assertion failure with MSVC debug-mode iterators), so we compare the
+    // elements' addresses.
+    QVERIFY(&map.constBegin().key() != &map2.constBegin().key());
+    QVERIFY(&map.constBegin().value() != &map2.constBegin().value());
 }
 
 void tst_QMap::firstLast()
@@ -1836,12 +1841,6 @@ void tst_QMap::equal_range()
     QCOMPARE(map.count(1), 2);
 }
 
-template <class T>
-const T &const_(const T &t)
-{
-    return t;
-}
-
 void tst_QMap::insert()
 {
     QMap<QString, float> map;