From 619c0cc0d6ccdc5e1f8be627b4e00dcc628ae7c9 Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@nokia.com>
Date: Wed, 27 Jul 2011 12:24:16 +0200
Subject: [PATCH] QmlCppDebugging: handling Harmattan mixed debugging
Change-Id: Idfc0a6d48bcc1c42aac58ea03b5a51ad6e661f25
Reviewed-on: http://codereview.qt.nokia.com/2275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
src/plugins/debugger/qml/qmlcppengine.cpp | 2 +-
src/plugins/debugger/qml/qmlengine.cpp | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 96728e98489..f0e396bde0c 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -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);
}
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 4634729ec7f..d9bb6bbf0bb 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -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)),
--
GitLab