Debugger: Add dumper support for IPv6 in QHostAddress

Change-Id: Ia542cf9e3c695a2c3c4b6340c3d72dfe743339c6
Reviewed-by: Thiago Macieira <[email protected]>

1 files changed, 13 insertions, 0 deletions

diff --git a/src/plugins/debugger/debuggerprotocol.cpp b/src/plugins/debugger/debuggerprotocol.cpp
index b837ef80ce4..bb89c9adfe9 100644
--- a/src/plugins/debugger/debuggerprotocol.cpp
+++ b/src/plugins/debugger/debuggerprotocol.cpp
@@ -32,6 +32,7 @@
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QDebug>
+#include <QHostAddress>
 
 #include <ctype.h>
 
@@ -611,6 +612,18 @@ QString decodeData(const QByteArray &ba, int encoding)
             const QTime time = timeFromData(ba.mid(p + 1 ).toInt());
             return QDateTime(date, time).toString(Qt::TextDate);
         }
+        case IPv6AddressAndHexScopeId: { // 27, 16 hex-encoded bytes, "%" and the string-encoded scope
+            const int p = ba.indexOf('%');
+            QHostAddress ip6(QString::fromLatin1(p == -1 ? ba : ba.left(p)));
+            if (ip6.isNull())
+                break;
+
+            const QByteArray scopeId = p == -1 ? QByteArray() : QByteArray::fromHex(ba.mid(p + 1));
+            if (!scopeId.isEmpty())
+                ip6.setScopeId(QString::fromUtf16(reinterpret_cast<const ushort *>(scopeId.constData()),
+                                                  scopeId.length() / 2));
+            return ip6.toString();
+        }
     }
     qDebug() << "ENCODING ERROR: " << encoding;
     return QCoreApplication::translate("Debugger", "<Encoding error>");