aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/debugger/debuggerrunner.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2012-08-09 01:50:26 +0200
committerhjk <[email protected]>2012-08-14 14:01:56 +0200
commitd42b9b026a8c982b7c1e56e0b5a9c9c50c664bd3 (patch)
tree485f56dbddee2a6ed1c109a4287cd30645a88b0f /src/plugins/debugger/debuggerrunner.cpp
parentf2bf6c9a3634196c006ec1c4825db94abd0f5116 (diff)
debugger: remove commandline options to disable debugger engines
This was mostly useful in cases where the guessing magic failed. With the new Profiles, the debugger engines can be adjusted there. Change-Id: I96622775588bb46c3e4e35af27e352593eb405d1 Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins/debugger/debuggerrunner.cpp')
-rw-r--r--src/plugins/debugger/debuggerrunner.cpp20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 65d0a1f1847..59d745fe8ff 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -701,18 +701,10 @@ QString ConfigurationCheck::errorDetailsString() const
// Convenience helper to check whether an engine is enabled and configured
// correctly.
-static inline bool canUseEngine(DebuggerEngineType et,
+static bool canUseEngine(DebuggerEngineType et,
const DebuggerStartParameters &sp,
- unsigned cmdLineEnabledEngines,
ConfigurationCheck *result)
{
- // Enabled?
- if ((et & cmdLineEnabledEngines) == 0) {
- result->errorDetails.push_back(DebuggerPlugin::tr("The debugger engine '%1' is disabled.").
- arg(QLatin1String(engineTypeName(et))));
- return false;
- }
- // Configured.
switch (et) {
case CdbEngineType:
return checkCdbConfiguration(sp, result);
@@ -749,19 +741,11 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa
}
if (debug)
qDebug() << " Required: " << engineTypeNames(requiredTypes);
- // Filter out disabled types, command line + current settings.
- unsigned cmdLineEnabledEngines = debuggerCore()->enabledEngines();
-#ifdef WITH_LLDB
- if (!Core::ICore::settings()->value(QLatin1String("LLDB/enabled")).toBool())
- cmdLineEnabledEngines &= ~LldbEngineType;
-#else
- cmdLineEnabledEngines &= ~LldbEngineType;
-#endif
DebuggerEngineType usableType = NoEngineType;
QList<DebuggerEngineType> unavailableTypes;
foreach (DebuggerEngineType et, requiredTypes) {
- if (canUseEngine(et, sp, cmdLineEnabledEngines, &result)) {
+ if (canUseEngine(et, sp, &result)) {
result.errorDetails.clear();
usableType = et;
break;