diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-08 08:57:55 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-08 08:58:46 (GMT) |
| commit | 5307798688898b73e953276bbac36be5549728d7 (patch) | |
| tree | b6c420beb1fcf57cdd3374c0122d6532663490a4 /src | |
| parent | a9ebf946966f4d0a82c040e4b7fb67d973d506e9 (diff) | |
| download | Qt-5307798688898b73e953276bbac36be5549728d7.zip Qt-5307798688898b73e953276bbac36be5549728d7.tar.gz Qt-5307798688898b73e953276bbac36be5549728d7.tar.bz2 | |
Revert "QPointer: assert when using QPointer on destroyed QObject"
This reverts commit 96e873d4ed59bd9feef1c5dacc28f77377e53c47.
Many tests where failing. (including the QWidget autotest)
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 12a09fd..7fe9c52 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -392,7 +392,6 @@ void QMetaObject::addGuard(QObject **ptr) return; } QMutexLocker locker(guardHashLock()); - Q_ASSERT_X(!QObjectPrivate::get(*ptr)->wasDeleted, "QPointer", "Detected QPointer creation on a QObject being deleted"); QObjectPrivate::get(*ptr)->hasGuards = true; hash->insert(*ptr, ptr); } @@ -435,7 +434,6 @@ void QMetaObject::changeGuard(QObject **ptr, QObject *o) } QMutexLocker locker(guardHashLock()); if (o) { - Q_ASSERT_X(!QObjectPrivate::get(o)->wasDeleted, "QPointer", "Detected QPointer creation on a QObject being deleted"); hash->insert(o, ptr); QObjectPrivate::get(o)->hasGuards = true; } |