From 7d4284e5d9f9b161b4844093987458e8fa53af49 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 14 Mar 2011 15:50:23 +0100 Subject: [PATCH] Revert "Debugger: Message box when preferred debugger is not set up." As it causes messages on Linux. This reverts commit c75738f9ace4f8683db8f9f08ae538b7d7f4c219. --- src/plugins/debugger/debuggerrunner.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 37877d4bc4..e4d9faaf3f 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -544,12 +544,14 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa if (et & cmdLineEnabledEngines) { usableTypes.push_back(et); } else { - result.errorDetails.push_back(DebuggerPlugin::tr("The debugger engine '%1' is disabled."). - arg(engineTypeName(et))); + const QString msg = DebuggerPlugin::tr("The debugger engine '%1' preferred for " + "debugging binaries of type %2 is disabled."). + arg(engineTypeName(et), sp.toolChainAbi.toString()); + debuggerCore()->showMessage(msg, LogWarning); } if (usableTypes.isEmpty()) { result.errorMessage = DebuggerPlugin::tr("This configuration requires the debugger engine %1, which is disabled."). - arg(QLatin1String(engineTypeName(requiredTypes.front()))); + arg(QLatin1String(engineTypeName(usableTypes.front()))); return result; } if (debug) @@ -570,6 +572,11 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa if (configurationOk) { break; } else { + const QString msg = DebuggerPlugin::tr("The debugger engine '%1' preferred " + "for debugging binaries of type %2 is not set up correctly: %3"). + arg(engineTypeName(usableTypes.front()), sp.toolChainAbi.toString(), + result.errorDetails.isEmpty() ? QString() : result.errorDetails.back()); + debuggerCore()->showMessage(msg, LogWarning); usableTypes.pop_front(); } } @@ -579,16 +586,6 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa result.errorMessage = DebuggerPlugin::tr("The debugger engine required for this configuration is not correctly configured."); return result; } - // Inform verbosely about MinGW-gdb/CDB fallbacks. - if (!result.errorDetails.isEmpty()) { - const QString msg = DebuggerPlugin::tr( - "The preferred debugger engine for debugging binaries of type '%1' is not available.\n" - "The debugger engine '%2' will be used as a fallback.\nDetails: %3"). - arg(sp.toolChainAbi.toString(), engineTypeName(usableTypes.front()), - result.errorDetails.join(QString(QLatin1Char('\n')))); - debuggerCore()->showMessage(msg, LogWarning); - showMessageBox(QMessageBox::Warning, "Warning", msg); - } // Anything left: Happy. result.errorMessage.clear(); result.errorDetails.clear(); -- 2.11.0