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

debugger: remove commandline options to disable debugger engines

Browse Source 
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 <qthjk@ovi.com>
This commit is contained in:
hjk
2012-08-09 01:50:26 +02:00
parent f2bf6c9a36
commit d42b9b026a
5 changed files with 17 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -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;