diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-28 09:58:16 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-28 09:58:16 (GMT) |
| commit | 42fdaf078b9332e13d260df00359e8adc8522872 (patch) | |
| tree | 6a1d7b675b788372720e928e4e2aba77bfcad552 /src/corelib | |
| parent | 262d0df3b166fecb3502e81b2ab85cadd71ae70f (diff) | |
| parent | a925ba1ab6316a155f2ac61f898c52f07a1340b4 (diff) | |
| download | Qt-42fdaf078b9332e13d260df00359e8adc8522872.zip Qt-42fdaf078b9332e13d260df00359e8adc8522872.tar.gz Qt-42fdaf078b9332e13d260df00359e8adc8522872.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 7be19b3..5303975 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -835,14 +835,7 @@ QObject::QObject(QObjectPrivate &dd, QObject *parent) QObject::~QObject() { Q_D(QObject); - if (d->wasDeleted) { -#if defined(QT_DEBUG) - qWarning("QObject: Double deletion detected"); -#endif - return; - } d->wasDeleted = true; - d->blockSig = 0; // unblock signals so we always emit destroyed() if (!d->isWidget) { |