aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2009-09-02 10:44:20 +0200
committercon <qtc-committer@nokia.com>2009-09-02 10:49:28 +0200
commit2ef19858511a09ceec1269ce01261ac5c97d2d14 (patch)
treef565e34b06ab818e9b3b993d3f8a2e9084198a3e
parentaa50e0bec31d03b64d265da1ea730d5c786fd89d (diff)
debugger: fix start up of scriptengine when discovering a script
(cherry picked from commit 5a4a376949f33a418e3b5495004afadd042d4518)
-rw-r--r--src/plugins/debugger/debuggermanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 2439aa8af4..89fac392da 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -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) {