forked from qt-creator/qt-creator
debugger: fix start up of scriptengine when discovering a script
This commit is contained in:
@@ -729,9 +729,6 @@ static IDebuggerEngine *determineDebuggerEngine(const QString &executable,
|
|||||||
QString *errorMessage,
|
QString *errorMessage,
|
||||||
QString *settingsIdHint)
|
QString *settingsIdHint)
|
||||||
{
|
{
|
||||||
if (IDebuggerEngine *tce = debuggerEngineForToolChain(static_cast<ProjectExplorer::ToolChain::ToolChainType>(toolChainType)))
|
|
||||||
return tce;
|
|
||||||
|
|
||||||
if (executable.endsWith(_(".js"))) {
|
if (executable.endsWith(_(".js"))) {
|
||||||
if (!scriptEngine) {
|
if (!scriptEngine) {
|
||||||
*errorMessage = msgEngineNotAvailable("Script Engine");
|
*errorMessage = msgEngineNotAvailable("Script Engine");
|
||||||
@@ -740,6 +737,9 @@ static IDebuggerEngine *determineDebuggerEngine(const QString &executable,
|
|||||||
return scriptEngine;
|
return scriptEngine;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (IDebuggerEngine *tce = debuggerEngineForToolChain(static_cast<ProjectExplorer::ToolChain::ToolChainType>(toolChainType)))
|
||||||
|
return tce;
|
||||||
|
|
||||||
#ifndef Q_OS_WIN
|
#ifndef Q_OS_WIN
|
||||||
Q_UNUSED(settingsIdHint)
|
Q_UNUSED(settingsIdHint)
|
||||||
if (!gdbEngine) {
|
if (!gdbEngine) {
|
||||||
|
Reference in New Issue
Block a user