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

ProjectExplorer: Clean up KitsManager API

Browse Source 
Change-Id: Ib0b11918fbae9577928b6209a913afb3eccc48b5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2013-09-10 17:59:34 +02:00
parent dd956b326d
commit f9aa1207d2
11 changed files with 82 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -589,12 +589,12 @@ public:
#ifdef Q_OS_WIN
if (Utils::winIs64BitSystem()) {
CdbMatcher matcher64(64);
if (Kit *cdb64Kit = KitManager::find(&matcher64))
if (Kit *cdb64Kit = KitManager::find(matcher64))
return cdb64Kit;
}
#endif
CdbMatcher matcher;
return KitManager::find(&matcher);
return KitManager::find(matcher);
}
private:
@@ -620,12 +620,9 @@ bool fillParameters(DebuggerStartParameters *sp, const Kit *kit, QString *errorM
abis = Abi::abisOfBinary(Utils::FileName::fromString(sp->executable));
}
if (!abis.isEmpty()) {
AbiKitMatcher matcher(abis);
kit = KitManager::find(&matcher);
if (!kit) {
CompatibleAbiKitMatcher matcher(abis);
kit = KitManager::find(&matcher);
}
kit = KitManager::find(AbiKitMatcher(abis));
if (!kit)
kit = KitManager::find(CompatibleAbiKitMatcher(abis));
}
if (!kit)
kit = KitManager::defaultKit();