diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 8e422f1cfd6cfa3e3da51271669ac113ce2f0fac..b3361414bcb9a4541d12bbdff606d38ad6270b2f 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 953b91b67caa1eb75cdbbec26f731a7df055457a..455350d69bf1ba0a3723fe6e5dd5daa96a771f2a 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 dc164491c4eca97cbaa2aee4cca73831700032e3..37bd749658ae7b977570386324a81ef113f655a0 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();