From 85a1e3ca55c512d45817a0a7c79cd3900968abc4 Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@digia.com>
Date: Mon, 29 Jul 2013 11:02:28 +0200
Subject: [PATCH] Debugging: Continue Cpp debugging even if QML debugger fails
In mixed debugging, QML debugger is the slave engine. Continue
debugging with the master engine i.e. Cpp engine even if the
slave engine fails. The slave engine may fail when the application
is not set up for QML/JS debugging or when there are insufficient
available ports etc.
Task-number: QTCREATORBUG-9836
Change-Id: I2549196413c839e660925fe2edb3182e6848b5fc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
src/plugins/debugger/qml/qmlcppengine.cpp | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 90237fab68a..28179ba96be 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -761,9 +761,6 @@ void QmlCppEngine::slaveEngineStateChanged
QTC_ASSERT(state() == InferiorRunRequested, qDebug() << state());
notifyInferiorRunOk();
}
- } else if (newState == EngineRunFailed) {
- if (d->m_cppEngine->targetState() != DebuggerFinished)
- d->m_cppEngine->quitDebugger();
}
}
}
--
GitLab