From 4ead5b72029a5df86c3d661d64b2931c9df2daf6 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 14 Oct 2009 12:59:39 +0200
Subject: [PATCH] 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.
---
share/qtcreator/gdbmacros/gdbmacros.cpp | 4 ++--
share/qtcreator/gdbmacros/gdbmacros_p.h | 4 ++--
tests/auto/debugger/tst_dumpers.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index f68a1cf6cc9..5ad19cadec9 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -100,8 +100,8 @@
#ifdef QT_BOOTSTRAPPED
# define NS ""
-# define NSX ""
-# define NSY ""
+# define NSX "'"
+# define NSY "'"
#else
diff --git a/share/qtcreator/gdbmacros/gdbmacros_p.h b/share/qtcreator/gdbmacros/gdbmacros_p.h
index 7914e04aa44..fc6b665e9ad 100644
--- a/share/qtcreator/gdbmacros/gdbmacros_p.h
+++ b/share/qtcreator/gdbmacros/gdbmacros_p.h
@@ -56,8 +56,8 @@
# define NSY "'"
#else
# define NS ""
-# define NSX ""
-# define NSY ""
+# define NSX "'"
+# define NSY "'"
#endif
#if defined(QT_BEGIN_NAMESPACE)
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index ae76d2a8601..deb99784c78 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -2243,7 +2243,7 @@ void tst_Debugger::dumpQVariant_QStringList()
{
QVariant v = QStringList() << "Hi";
testDumper("value='(QStringList) ',type='$T',numchild='1',"
- "children=[{name='value',exp='(*('myns::QStringList'*)%)',"
+ "children=[{name='value',exp='(*('"NS"QStringList'*)%)',"
"type='QStringList',numchild='1'}]"
<< QByteArray::number(quintptr(&v)),
&v, NS"QVariant", true);
--
GitLab