summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qobject_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-06-28 12:17:34 +0200
committerQt by Nokia <qt-info@nokia.com>2011-06-29 15:10:14 +0200
commit118b3d3f8415037a1afddc6b962bd809905527d5 (patch)
tree843b8c725400cc468844d41708f2f0543ef0c283 /src/corelib/kernel/qobject_p.h
parentfa65123a86529bbbdaf2b774d741400a3dbfd593 (diff)
Remove Qt3 support functionality from parts of QtCore
Change-Id: I90f391e9bfc412087bd0401e28d2497571f81aa1 Reviewed-on: http://codereview.qt.nokia.com/825 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qobject_p.h')
-rw-r--r--src/corelib/kernel/qobject_p.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 3968a31bb8..9151e8eb7b 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -157,10 +157,6 @@ public:
void addConnection(int signal, Connection *c);
void cleanConnectionLists();
-#ifdef QT3_SUPPORT
- void sendPendingChildInsertedEvents();
-#endif
-
static inline Sender *setCurrentSender(QObject *receiver,
Sender *sender);
static inline void resetCurrentSender(QObject *receiver,
@@ -190,14 +186,6 @@ public:
Sender *currentSender; // object currently activating the object
mutable quint32 connectedSignals[2];
-#ifdef QT3_SUPPORT
- QVector< QWeakPointer<QObject> > pendingChildInsertedEvents;
-#else
- // preserve binary compatibility with code compiled without Qt 3 support
- // keeping the binary layout stable helps the Qt Creator debugger
- void *unused;
-#endif
-
QList<QPointer<QObject> > eventFilters;
union {
QObject *currentChildBeingDeleted;