Merge pull request #2679

13ea403 FutureScheduler: drop moveToThread, setParent might silently fail (xiphon)
This commit is contained in:
luigi1111 2019-12-23 09:05:09 -05:00
commit 82affff63f
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -32,12 +32,6 @@ private:
QFutureWatcher<T> *newWatcher() QFutureWatcher<T> *newWatcher()
{ {
QFutureWatcher<T> *watcher = new QFutureWatcher<T>(); QFutureWatcher<T> *watcher = new QFutureWatcher<T>();
QThread *schedulerThread = this->thread();
if (watcher->thread() != schedulerThread)
{
watcher->moveToThread(schedulerThread);
}
watcher->setParent(this);
return watcher; return watcher;
} }