--- a/src/corelib/kernel/qmetaobject_p.h	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/corelib/kernel/qmetaobject_p.h	Wed Aug 18 10:37:55 2010 +0300
@@ -276,12 +276,15 @@
                     ++templdepth;
                 if (c == '>')
                     --templdepth;
-                if (templdepth == 0) {
+                if (templdepth == 0 || (templdepth == 1 && c == ',')) {
                     result += normalizeTypeInternal(tt, t-1, fixScope, false);
                     result += c;
-                    if (*t == '>')
-                        result += ' '; // avoid >>
-                    break;
+                    if (templdepth == 0) {
+                        if (*t == '>')
+                            result += ' '; // avoid >>
+                        break;
+                    }
+                    tt = t;
                 }
             }
         }