From afd9fd824d6d61e5d6698b09bd2fe304977ccad4 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 5 Aug 2009 14:05:03 +0200
Subject: [PATCH] Debugger auto tests: Tracked changes to QObjectPrivate.
---
share/qtcreator/gdbmacros/gdbmacros_p.h | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/share/qtcreator/gdbmacros/gdbmacros_p.h b/share/qtcreator/gdbmacros/gdbmacros_p.h
index ed950224af1..8c9a5af9c7e 100644
--- a/share/qtcreator/gdbmacros/gdbmacros_p.h
+++ b/share/qtcreator/gdbmacros/gdbmacros_p.h
@@ -91,6 +91,7 @@ public:
ObjectPrivate() {}
virtual ~ObjectPrivate() {}
+#if QT_VERSION < 0x040600
QList<QObject *> pendingChildInsertedEvents;
void *threadData;
void *currentSender;
@@ -98,18 +99,26 @@ public:
QList<QPointer<QObject> > eventFilters;
void *extraData;
-#if QT_VERSION >= 0x040600
- mutable quint32 connectedSignals[2];
-#else
mutable quint32 connectedSignals;
-#endif
QString objectName;
void *connectionLists;
SenderList senders;
int *deleteWatch;
-#if QT_VERSION >= 0x040600
+#else
+ QString objectName;
+ void *extraData;
+ void *threadData;
+ void *connectionLists;
+ SenderList senders;
+ void *currentSender;
+ mutable quint32 connectedSignals[2];
+ QList<QObject *> pendingChildInsertedEvents;
+ QList<QPointer<QObject> > eventFilters;
+ void *currentChildBeingDeleted;
+ void *declarativeData;
void *objectGuards;
+ int *deleteWatch;
#endif
};
--
GitLab