Commit 4ead5b72 authored by ck's avatar ck
Browse files

Debugger: Dumper fix.

- If NSX and NSY have quotes for the QT_NAMESPACE case, they need them
  for the non-namespace case too.
- Dumper autotest: Replace hard-coded namespace with compile-time
  dynamic one.
parent f3132c13
...@@ -100,8 +100,8 @@ ...@@ -100,8 +100,8 @@
#ifdef QT_BOOTSTRAPPED #ifdef QT_BOOTSTRAPPED
# define NS "" # define NS ""
# define NSX "" # define NSX "'"
# define NSY "" # define NSY "'"
#else #else
......
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
# define NSY "'" # define NSY "'"
#else #else
# define NS "" # define NS ""
# define NSX "" # define NSX "'"
# define NSY "" # define NSY "'"
#endif #endif
#if defined(QT_BEGIN_NAMESPACE) #if defined(QT_BEGIN_NAMESPACE)
......
...@@ -2243,7 +2243,7 @@ void tst_Debugger::dumpQVariant_QStringList() ...@@ -2243,7 +2243,7 @@ void tst_Debugger::dumpQVariant_QStringList()
{ {
QVariant v = QStringList() << "Hi"; QVariant v = QStringList() << "Hi";
testDumper("value='(QStringList) ',type='$T',numchild='1'," testDumper("value='(QStringList) ',type='$T',numchild='1',"
"children=[{name='value',exp='(*('myns::QStringList'*)%)'," "children=[{name='value',exp='(*('"NS"QStringList'*)%)',"
"type='QStringList',numchild='1'}]" "type='QStringList',numchild='1'}]"
<< QByteArray::number(quintptr(&v)), << QByteArray::number(quintptr(&v)),
&v, NS"QVariant", true); &v, NS"QVariant", 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