diff -r 5dc02b23752f -r 3e2da88830cd src/corelib/tools/qmap.h
--- a/src/corelib/tools/qmap.h	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/corelib/tools/qmap.h	Wed Aug 18 10:37:55 2010 +0300
@@ -977,7 +977,7 @@
     { return QMap<Key, T>::insertMulti(key, value); }
 
     inline QMultiMap &operator+=(const QMultiMap &other)
-    { unite(other); return *this; }
+    { this->unite(other); return *this; }
     inline QMultiMap operator+(const QMultiMap &other) const
     { QMultiMap result = *this; result += other; return result; }
 
@@ -1052,12 +1052,7 @@
     typename QMap<Key, T>::iterator end(QMap<Key, T>::end());
     while (i != end && !qMapLessThanKey<Key>(key, i.key())) {
         if (i.value() == value) {
-#if defined(Q_CC_RVCT)
-            // RVCT has problems with scoping, apparently.
-            i = QMap<Key, T>::erase(i);
-#else
-            i = erase(i);
-#endif
+            i = this->erase(i);
             ++n;
         } else {
             ++i;