From 8d810bd1d2299d4972cd258e39242adc25e0559d Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 28 Oct 2009 09:23:57 +0100
Subject: [PATCH] Debugger: Fix dumper tests for 64-bit Linux.
Resolved padding issue for QMapNode.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
tests/auto/debugger/tst_dumpers.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 8e94aadc668..2cb677968c5 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -1530,8 +1530,10 @@ template <typename K, typename V>
QByteArray keyTypeStr = typeToString<K>();
QByteArray valTypeStr = typeToString<V>();
#if QT_VERSION >= 0x040500
- expected.append("addr='").
- append(ptrToBa(reinterpret_cast<char *>(&(*it)) + sizeof(V))).
+ QMapNode<K, V> *node = 0;
+ size_t backwardOffset = size_t(&node->backward) - valOff;
+ char *addr = reinterpret_cast<char *>(&(*it)) + backwardOffset;
+ expected.append("addr='").append(ptrToBa(addr)).
append("',type='"NS"QMapNode<").append(keyTypeStr).append(",").
append(valTypeStr).append(MAP_NODE_TYPE_END).append("'");
#else
--
GitLab