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

Debugger: Make cancel work in DebuggerOptionsPage

Browse Source 
Change-Id: I09735507703e9a2c55aff68a25a4405cf12c9ab4
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Tobias Hunger
2013-10-28 17:47:37 +01:00
committed by hjk
parent b17e8e3061
commit fd8f2c6cdb
6 changed files with 201 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/debugger/debuggeritem.cpp
View File

@@ -61,6 +61,13 @@ DebuggerItem::DebuggerItem()
m_isAutoDetected = false;
}
DebuggerItem::DebuggerItem(const QVariant &id)
{
m_id = id;
m_engineType = NoEngineType;
m_isAutoDetected = false;
}
DebuggerItem::DebuggerItem(const QVariantMap &data)
{
m_command = FileName::fromUserInput(data.value(QLatin1String(DEBUGGER_INFORMATION_COMMAND)).toString());
@@ -143,9 +150,9 @@ QStringList DebuggerItem::abiNames() const
bool DebuggerItem::operator==(const DebuggerItem &other) const
{
return m_id == other.m_id
&& m_displayName == other.m_displayName
&& m_isAutoDetected == other.m_isAutoDetected
&& m_command == other.m_command
&& m_abis == other.m_abis;
&& m_command == other.m_command;
}
QVariantMap DebuggerItem::toMap() const
@@ -233,7 +240,7 @@ DebuggerItem::MatchLevel DebuggerItem::matchTarget(const Abi &targetAbi) const
bool Debugger::DebuggerItem::isValid() const
{
return m_engineType != NoEngineType;
return !m_id.isNull();
}
} // namespace Debugger;