feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: fix start up of scriptengine when discovering a script

Browse Source 
(cherry picked from commit 5a4a376949)
This commit is contained in:
hjk
2009-09-02 10:44:20 +02:00
committed by con
parent aa50e0bec3
commit 2ef1985851
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/debuggermanager.cpp
View File

@@ -730,9 +730,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");
@@ -741,6 +738,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) {