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

AndroidDebugging: Enable Cpp/QML mixed debugging

Browse Source 
Change-Id: Ie748b52a93916b332f1e4fa7c6ff04dd6cc30bfa
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Aurindam Jana
2013-04-19 17:04:22 +02:00
committed by hjk
parent 893eb51c75
commit adb6e518ef
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,6 +440,18 @@ void QmlCppEngine::notifyInferiorShutdownOk()
DebuggerEngine::notifyInferiorShutdownOk(); DebuggerEngine::notifyInferiorShutdownOk();
} }
void QmlCppEngine::notifyInferiorSetupOk()
{
EDEBUG("\nMASTER INFERIOR SETUP OK");
emit aboutToNotifyInferiorSetupOk();
DebuggerEngine::notifyInferiorSetupOk();
}
void QmlCppEngine::notifyEngineRemoteServerRunning(const QByteArray &serverChannel, int pid)
{
d->m_cppEngine->notifyEngineRemoteServerRunning(serverChannel, pid);
}
void QmlCppEngine::setupInferior() void QmlCppEngine::setupInferior()
{ {
EDEBUG("\nMASTER SETUP INFERIOR"); EDEBUG("\nMASTER SETUP INFERIOR");

6
src/plugins/debugger/qml/qmlcppengine.h
View File

@@ -125,6 +125,12 @@ protected:
void notifyEngineRunAndInferiorRunOk(); void notifyEngineRunAndInferiorRunOk();
void notifyInferiorShutdownOk(); void notifyInferiorShutdownOk();
void notifyInferiorSetupOk();
void notifyEngineRemoteServerRunning(const QByteArray &, int pid);
signals:
void aboutToNotifyInferiorSetupOk();
private: private:
void engineStateChanged(DebuggerState newState); void engineStateChanged(DebuggerState newState);
void setState(DebuggerState newState, bool forced = false); void setState(DebuggerState newState, bool forced = false);