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

Debugger: Abandon special DebuggerKitChooser

Browse Source 
The regular one with icon display is good enough nowadays.

Change-Id: I9a511c9975ceaeae0bb8005ac647fa710bf9d900
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2019-06-11 10:27:16 +02:00
parent 309c644466
commit fee7e9fbda
5 changed files with 11 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/debugger/debuggerdialogs.cpp
View File

@@ -97,36 +97,6 @@ Q_DECLARE_METATYPE(Debugger::Internal::StartApplicationParameters)
namespace Debugger {
namespace Internal {
///////////////////////////////////////////////////////////////////////
//
// DebuggerKitChooser
//
///////////////////////////////////////////////////////////////////////
DebuggerKitChooser::DebuggerKitChooser(Mode mode, QWidget *parent)
: KitChooser(parent)
, m_hostAbi(Abi::hostAbi())
, m_mode(mode)
{
setKitPredicate([this](const Kit *k) {
// Match valid debuggers and restrict local debugging to compatible toolchains.
auto errors = DebuggerKitAspect::configurationErrors(k);
// we do not care for mismatched ABI if we want *any* debugging
if (m_mode == AnyDebugging && errors == DebuggerKitAspect::DebuggerDoesNotMatch)
errors = DebuggerKitAspect::NoConfigurationError;
if (errors)
return false;
if (m_mode == LocalDebugging)
return ToolChainKitAspect::targetAbi(k).os() == m_hostAbi.os();
return true;
});
}
QString DebuggerKitChooser::kitToolTip(Kit *k) const
{
return DebuggerKitAspect::displayString(k);
}
///////////////////////////////////////////////////////////////////////
//
// StartApplicationParameters
@@ -520,7 +490,8 @@ AttachToQmlPortDialog::AttachToQmlPortDialog(QWidget *parent)
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowTitle(tr("Start Debugger"));
d->kitChooser = new DebuggerKitChooser(DebuggerKitChooser::AnyDebugging, this);
d->kitChooser = new KitChooser(this);
d->kitChooser->setShowIcons(true);
d->kitChooser->populate();
d->portSpinBox = new QSpinBox(this);