|
|
|
@ -3732,7 +3732,7 @@ void QApplication::removePostedEvent( QEvent * event )
|
|
|
|
|
void qThreadTerminationHandlerRecursive( QObject* object, QThread* originThread, QThread* destinationThread ) {
|
|
|
|
|
#ifdef QT_THREAD_SUPPORT
|
|
|
|
|
QThread* objectThread = object->contextThreadObject();
|
|
|
|
|
if (objectThread != destinationThread) {
|
|
|
|
|
if (objectThread && (objectThread != destinationThread)) {
|
|
|
|
|
QThread::CleanupType cleanupType = objectThread->cleanupType();
|
|
|
|
|
if (cleanupType == QThread::CleanupMergeObjects) {
|
|
|
|
|
object->moveToThread(destinationThread);
|
|
|
|
|