From a16aa2e0d6345e438addf73f966c26943643cbe8 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 14 Jul 2009 18:14:49 +0200
Subject: [PATCH] debugger: remove duplicated 'completeSuffix' entry in
QFileInfo dumper
---
share/qtcreator/gdbmacros/gdbmacros.cpp | 1 -
src/plugins/debugger/watchhandler.cpp | 7 +++++++
tests/manual/gdbdebugger/simple/app.cpp | 8 ++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 8e422f1cfd6..b3361414bcb 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -1319,7 +1319,6 @@ static void qDumpQFileInfo(QDumper &d)
d.putHash("isBundle", info.isBundle());
d.putHash("bundleName", info.bundleName());
#endif
- d.putHash("completeSuffix", info.completeSuffix());
d.putHash("fileName", info.fileName());
d.putHash("filePath", info.filePath());
d.putHash("group", info.group());
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 953b91b67ca..455350d69bf 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -859,6 +859,13 @@ void WatchModel::insertBulkData(const QList<WatchData> &list)
// overwrite existing items
Iterator it = newList.begin();
int oldCount = newList.size() - list.size();
+ if (oldCount != parent->children.size())
+ qDebug() //<< "LIST:" << list.keys()
+ << "NEWLIST: " << newList.keys()
+ << "OLD COUNT: " << oldCount
+ << "P->CHILDREN.SIZE: " << parent->children.size()
+ << "NEWLIST SIZE: " << newList.size()
+ << "LIST SIZE: " << list.size();
QTC_ASSERT(oldCount == parent->children.size(), return);
for (int i = 0; i < oldCount; ++i, ++it)
parent->children[i]->setData(*it);
diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp
index dc164491c4e..37bd749658a 100644
--- a/tests/manual/gdbdebugger/simple/app.cpp
+++ b/tests/manual/gdbdebugger/simple/app.cpp
@@ -179,6 +179,13 @@ void testQByteArray()
ba += 2;
}
+void testQFileInfo()
+{
+ QFileInfo fi("/tmp/t");
+ QString s = fi.absoluteFilePath();
+ QString t = fi.bundleName();
+}
+
void testQHash()
{
#if 1
@@ -1208,6 +1215,7 @@ void testQHash1()
int main(int argc, char *argv[])
{
+ testQFileInfo();
testObject1();
testVector1();
testQHash1();
--
GitLab