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

debugger: merge notifyEngineRemoteSetup* and handleRemoteSetup*

Browse Source 
Change-Id: I89abcb0dcceef6767cb3e78f4e85c1cd718e78c1
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-06-13 11:29:26 +02:00
committed by hjk
parent d601e3799f
commit ceb575741c
17 changed files with 56 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,7 +436,7 @@ void QmlCppEngine::setupEngine()
d->m_qmlEngine->setupSlaveEngine();
d->m_cppEngine->setupSlaveEngine();
if (startParameters().requestRemoteSetup)
if (startParameters().remoteSetupNeeded)
notifyEngineRequestRemoteSetup();
}
@@ -777,21 +777,21 @@ void QmlCppEngine::slaveEngineStateChanged
}
}
void QmlCppEngine::handleRemoteSetupDone(int gdbServerPort, int qmlPort)
void QmlCppEngine::notifyEngineRemoteSetupDone(int gdbServerPort, int qmlPort)
{
EDEBUG("MASTER REMOTE SETUP DONE");
notifyEngineRemoteSetupDone();
DebuggerEngine::notifyEngineRemoteSetupDone(gdbServerPort, qmlPort);
cppEngine()->handleRemoteSetupDone(gdbServerPort, qmlPort);
qmlEngine()->handleRemoteSetupDone(gdbServerPort, qmlPort);
cppEngine()->notifyEngineRemoteSetupDone(gdbServerPort, qmlPort);
qmlEngine()->notifyEngineRemoteSetupDone(gdbServerPort, qmlPort);
}
void QmlCppEngine::handleRemoteSetupFailed(const QString &message)
void QmlCppEngine::notifyEngineRemoteSetupFailed(const QString &message)
{
EDEBUG("MASTER REMOTE SETUP FAILED");
notifyEngineRemoteSetupFailed();
notifyEngineRemoteSetupFailed(message);
cppEngine()->handleRemoteSetupFailed(message);
cppEngine()->notifyEngineRemoteSetupFailed(message);
}
void QmlCppEngine::showMessage(const QString &msg, int channel, int timeout) const