feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Do not directly call Engine::notify() functions from other threads

Browse Source 
We call updateViews() and similar and therefore need to be in the gui thread.

Change-Id: Ia0e9be59dbcc529341449ba7f64a93cda320ff5b
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
This commit is contained in:
hjk
2014-11-04 12:42:52 +01:00
parent 023eb375ca
commit 55ade84132
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androiddebugsupport.cpp
View File

@@ -166,7 +166,7 @@ AndroidDebugSupport::AndroidDebugSupport(AndroidRunConfiguration *runConfig,
[this](const QString &errorMsg) { [this](const QString &errorMsg) {
QTC_ASSERT(m_runControl, return); QTC_ASSERT(m_runControl, return);
m_runControl->appendMessage(errorMsg, Utils::DebugFormat); m_runControl->appendMessage(errorMsg, Utils::DebugFormat);
m_engine->notifyInferiorExited(); QMetaObject::invokeMethod(m_engine, "notifyInferiorExited", Qt::QueuedConnection);
}); });
connect(m_runner, &AndroidRunner::remoteErrorOutput, connect(m_runner, &AndroidRunner::remoteErrorOutput,

3
src/plugins/debugger/debuggerengine.h
View File

@@ -318,8 +318,7 @@ protected:
virtual void notifyInferiorStopOk(); virtual void notifyInferiorStopOk();
virtual void notifyInferiorSpontaneousStop(); virtual void notifyInferiorSpontaneousStop();
virtual void notifyInferiorStopFailed(); virtual void notifyInferiorStopFailed();
public: Q_SLOT virtual void notifyInferiorExited();
virtual void notifyInferiorExited();
protected: protected:
virtual void notifyInferiorShutdownOk(); virtual void notifyInferiorShutdownOk();