Commit 619c0cc0 authored by Christiaan Janssen's avatar Christiaan Janssen
Browse files

QmlCppDebugging: handling Harmattan mixed debugging

Change-Id: Idfc0a6d48bcc1c42aac58ea03b5a51ad6e661f25
Reviewed-on: http://codereview.qt.nokia.com/2275

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent dbbaccca
......@@ -666,7 +666,7 @@ void QmlCppEngine::slaveEngineStateChanged
void QmlCppEngine::handleRemoteSetupDone(int gdbServerPort, int qmlPort)
{
EDEBUG("MASTER REMOTE SETUP DONE");
d->m_qmlEngine->handleRemoteSetupDone(gdbServerPort, qmlPort);
d->m_qmlEngine->startParameters().qmlServerPort = qmlPort;
d->m_cppEngine->handleRemoteSetupDone(gdbServerPort, qmlPort);
}
......
......@@ -193,7 +193,10 @@ void QmlEngine::setupInferior()
QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
if (startParameters().startMode == AttachToRemote) {
emit requestRemoteSetup();
if (startParameters().qmlServerPort != quint16(-1))
notifyInferiorSetupOk();
else
emit requestRemoteSetup();
} else {
connect(&d->m_applicationLauncher,
SIGNAL(processExited(int)),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment