1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not call QueuedConnection slot on partialy destroyed object

Browse Source 
This is a regression introduced in Qt 4.8
When QApplication::processEvents is called from a destructor, it is
possible that pending events would still be called on the already
destroyed subclass.
Prevent that by using the same pattern as in QMetaObject::activate

Change-Id: Ida50db07ae089264402dafcde7a41a066479d08b
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Olivier Goffart 2011-12-15 07:24:49 +01:00 committed by Qt by Nokia
parent bbc098ab9f
commit 87679491cb
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qobject.cpp
View File

@ -429,7 +429,7 @@ void QMetaCallEvent::placeMetaCall(QObject *object)
{ {
if (slotObj_) { if (slotObj_) {
slotObj_->call(object, args_); slotObj_->call(object, args_);
} else if (callFunction_) { } else if (callFunction_ && method_offset_ <= object->metaObject()->methodOffset()) {
callFunction_(object, QMetaObject::InvokeMetaMethod, method_relative_, args_); callFunction_(object, QMetaObject::InvokeMetaMethod, method_relative_, args_);
} else { } else {
QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod, method_offset_ + method_relative_, args_); QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod, method_offset_ + method_relative_, args_);

21
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
View File

@ -4101,12 +4101,25 @@ public slots:
} }
}; };
static void processEvents()
{
qApp->processEvents();
}
void tst_QObject::baseDestroyed() void tst_QObject::baseDestroyed()
{ {
BaseDestroyed d; {
connect(&d, SIGNAL(destroyed()), &d, SLOT(slotUseList())); BaseDestroyed d;
//When d goes out of scope, slotUseList should not be called as the BaseDestroyed has connect(&d, SIGNAL(destroyed()), &d, SLOT(slotUseList()));
// already been destroyed while ~QObject emit destroyed //When d goes out of scope, slotUseList should not be called as the BaseDestroyed has
// already been destroyed while ~QObject emit destroyed
}
{
BaseDestroyed d;
connect(&d, &QObject::destroyed, processEvents);
QMetaObject::invokeMethod(&d, "slotUseList", Qt::QueuedConnection);
//the destructor will call processEvents, that should not call the slotUseList
}
} }
void tst_QObject::pointerConnect() void tst_QObject::pointerConnect()