debugger: fix regression in QVariant dumper

backport from master

2 files changed, 5 insertions, 2 deletions

diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 11c470a5d7..60deb7df86 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -2248,7 +2248,7 @@ static void qDumpQVariant(QDumper &d)
     if (isInvalid) {
         P(d, "value", "(invalid)");
     } else if (value.isEmpty()) {
-        P(d, "value", "(" << v.typeName() << ") " << qPrintable(value));
+        P(d, "value", "(" << v.typeName() << ") ");
     } else {
         QByteArray ba;
         ba += '(';
@@ -2256,7 +2256,7 @@ static void qDumpQVariant(QDumper &d)
         ba += ") ";
         ba += qPrintable(value);
         P(d, "value", ba);
-        P(d, "valueencoded", "4");
+        P(d, "valueencoded", "5");
     }
     P(d, "type", NS"QVariant");
     P(d, "numchild", (isInvalid ? "0" : "1"));
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 0572f57e25..a7f7cd04cd 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -376,6 +376,9 @@ QString decodeData(const QByteArray &ba, int encoding)
             const QByteArray decodedBa = QByteArray::fromBase64(ba);
             return QString::fromUtf16(reinterpret_cast<const ushort *>(decodedBa.data()), decodedBa.size() / 2);
         }
+        case 5: { //  base64 encoded 8 bit data, without quotes (see 1)
+            return quoteUnprintableLatin1(QByteArray::fromBase64(ba));
+        }
     }
     return QCoreApplication::translate("Debugger", "<Encoding error>");
 }