diff options
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 7c179c4bde5..2a419aabf8e 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1413,7 +1413,6 @@ bool QObject::event(QEvent *e) break; case QEvent::DeferredDelete: - qCDebug(lcDeleteLater) << "Deferred deleting" << this; delete this; break; @@ -2464,10 +2463,8 @@ void QObject::deleteLater() // as long as we're not guarding every access to the bit field. Q_D(QObject); - if (d->deleteLaterCalled) { - qCDebug(lcDeleteLater) << "Skipping deleteLater for already deferred object" << this; + if (d->deleteLaterCalled) return; - } d->deleteLaterCalled = true; @@ -2493,16 +2490,10 @@ void QObject::deleteLater() // non-conformant code path, and our best guess is that the scope level // should be 1. (Loop level 0 is special: it means that no event loops // are running.) - if (scopeLevel == 0 && loopLevel != 0) { - qCDebug(lcDeleteLater) << "Delete later called with scope level 0" - << "but loop level is > 0. Assuming scope is 1"; + if (scopeLevel == 0 && loopLevel != 0) scopeLevel = 1; - } } - qCDebug(lcDeleteLater) << "Posting deferred delete for" << this - << "with loop level" << loopLevel << "and scope level" << scopeLevel; - eventListLocker.unlock(); QCoreApplication::postEvent(this, new QDeferredDeleteEvent(loopLevel, scopeLevel)); |
