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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: I0194bdeda71e33fd5bc9cb3eb7a9198ae72815ed
This commit is contained in:
Eike Ziller
2017-11-07 15:10:36 +01:00
parent 8515fd13e3 83ff62aa13
commit a9e4e3608e
121 changed files with 638 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -374,8 +374,8 @@ void QmlCppEngine::setupEngine()
void QmlCppEngine::setupInferior()
{
EDEBUG("\nMASTER SETUP INFERIOR");
m_qmlEngine->setupInferior();
m_cppEngine->setupInferior();
m_qmlEngine->setupSlaveInferior();
m_cppEngine->setupSlaveInferior();
}
void QmlCppEngine::runEngine()