Commit 2ef19858 authored by hjk's avatar hjk Committed by con

debugger: fix start up of scriptengine when discovering a script

(cherry picked from commit 5a4a3769)
parent aa50e0be
......@@ -730,9 +730,6 @@ static IDebuggerEngine *determineDebuggerEngine(const QString &executable,
QString *errorMessage,
QString *settingsIdHint)
{
if (IDebuggerEngine *tce = debuggerEngineForToolChain(static_cast<ProjectExplorer::ToolChain::ToolChainType>(toolChainType)))
return tce;
if (executable.endsWith(_(".js"))) {
if (!scriptEngine) {
*errorMessage = msgEngineNotAvailable("Script Engine");
......@@ -741,6 +738,9 @@ static IDebuggerEngine *determineDebuggerEngine(const QString &executable,
return scriptEngine;
}
if (IDebuggerEngine *tce = debuggerEngineForToolChain(static_cast<ProjectExplorer::ToolChain::ToolChainType>(toolChainType)))
return tce;
#ifndef Q_OS_WIN
Q_UNUSED(settingsIdHint)
if (!gdbEngine) {
......
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