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

4
src/plugins/debugger/debuggeritemmanager.cpp
View File

@@ -90,7 +90,7 @@ static void readDebuggers(const FileName &fileName, bool isSystem)
// SDK debuggers are always considered to be up-to-date, so no need to recheck them.
} else {
// User settings.
if (item.isAutoDetected() && !item.isValid()) {
if (item.isAutoDetected() && (!item.isValid() || item.engineType() == NoEngineType)) {
qWarning() << QString::fromLatin1("DebuggerItem \"%1\" (%2) dropped since it is not valid")
.arg(item.command().toString()).arg(item.id().toString());
continue;
@@ -321,7 +321,7 @@ void DebuggerItemManager::saveDebuggers()
int count = 0;
foreach (const DebuggerItem &item, m_debuggers) {
if (item.isValid()) {
if (item.isValid() && item.engineType() != NoEngineType) {
QVariantMap tmp = item.toMap();
if (tmp.isEmpty())
continue;