Debugger: Fix handling of ? in dumper test

Normally, we use '?' as an optional Qt namespace qualification.
This clashes with the use of ? in a regexp type expression.
Re-order checks to avoid the clash.

Change-Id: I4a8aee0174f4f3d21bec624919856623808becb1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index b365da3e09..deab2783e1 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -414,10 +414,6 @@ struct Type
         expectedType.replace(' ', "");
         expectedType.replace("const", "");
         expectedType.replace('@', context.nameSpace);
-        if (fullNamespaceMatch)
-            expectedType.replace('?', context.nameSpace);
-        else
-            expectedType.replace('?', "");
 
         if (isPattern) {
             QString actual = QString::fromLatin1(actualType);
@@ -425,6 +421,11 @@ struct Type
             return QRegExp(expected).exactMatch(actual);
         }
 
+        if (fullNamespaceMatch)
+            expectedType.replace('?', context.nameSpace);
+        else
+            expectedType.replace('?', "");
+
         if (actualType == expectedType)
             return true;