diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index f68a1cf6cc9e5922990e0f45a0f72e8065862c95..5ad19cadec943dbe49a73ff049646a938f967557 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 7914e04aa448639e344dfd85c3f95e0e830ae69a..fc6b665e9ad22014dedc07a7613d7ed3b4fd5553 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 ae76d2a86015b29b872b7cdbcae54f32118da9c2..deb99784c786cbe3b7200e0ba0347132dab5c04e 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);