summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qobject_p.h
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-12-13 13:15:28 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-15 13:28:09 +0100
commit2561ab5841d49398729a283b70f8c70832b82d2f (patch)
treed729ed6e6751e76aa9bbcefbc01913c30ddc9f4d /src/corelib/kernel/qobject_p.h
parent0501c9d8f16183de2857fd58750a3876283ca8c5 (diff)
Remove QT_JAMBI_BUILD code
Change-Id: Ic9231b11293af4352f11cf075893175f0c9a471f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qobject_p.h')
-rw-r--r--src/corelib/kernel/qobject_p.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index a9cac3917a..882ec9b45e 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -179,10 +179,6 @@ public:
static inline void resetCurrentSender(QObject *receiver,
Sender *currentSender,
Sender *previousSender);
-#ifdef QT_JAMBI_BUILD
- static int *setDeleteWatch(QObjectPrivate *d, int *newWatch);
- static void resetDeleteWatch(QObjectPrivate *d, int *oldWatch, int deleteWatch);
-#endif
static QObjectPrivate *get(QObject *o) {
return o->d_func();
@@ -211,9 +207,6 @@ public:
// these objects are all used to indicate that a QObject was deleted
// plus QPointer, which keeps a separate list
QAtomicPointer<QtSharedPointer::ExternalRefCountData> sharedRefcount;
-#ifdef QT_JAMBI_BUILD
- int *deleteWatch;
-#endif
};