Commit ba947fbb authored by hjk's avatar hjk Committed by hjk

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: default avatarChristian Stenger <christian.stenger@theqtcompany.com>
parent bd964ab0
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment