flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-13 15:45:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Jenkins not yet supporting the new QMetaObject::invokeMethod syntax, locally on Qt 5.11 it is working

Browse Source
This commit is contained in:
Klaus Basan
2018-07-30 00:03:19 +02:00
parent c282d4e1f8
commit 4fef6fe0b2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/worker.cpp
View File

@@ -84,17 +84,19 @@ namespace BlackMisc
{ {
m_result = m_task(); m_result = m_task();
setFinished(); this->setFinished();
auto *ownThread = thread(); auto *ownThread = thread();
moveToThread(ownThread->thread()); // move worker back to the thread which constructed it, so there is no race on deletion this->moveToThread(ownThread->thread()); // move worker back to the thread which constructed it, so there is no race on deletion
QMetaObject::invokeMethod(ownThread, &CWorker::deleteLater);
QMetaObject::invokeMethod(this, &CWorker::deleteLater); //! \todo KB 2018-97 new syntax not yet supported on Jenkins QMetaObject::invokeMethod(ownThread, &CWorker::deleteLater)
QMetaObject::invokeMethod(ownThread, "deleteLater");
QMetaObject::invokeMethod(this, "deleteLater");
} }
const CLogCategoryList &CWorkerBase::getLogCategories() const CLogCategoryList &CWorkerBase::getLogCategories()
{ {
static const BlackMisc::CLogCategoryList cats { BlackMisc::CLogCategory::worker() }; static const BlackMisc::CLogCategoryList cats { CLogCategory::worker() };
return cats; return cats;
} }