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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/debugger/debuggerkitinformation.cpp
	src/plugins/languageclient/languageclientmanager.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/kit.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
This commit is contained in:
Eike Ziller
2019-03-14 15:14:40 +01:00
parent 62cafc1782 429eb73ace
commit c53ccceff1
154 changed files with 2211 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/debugger/debuggerkitinformation.cpp
View File

@@ -152,24 +152,7 @@ DebuggerKitAspect::DebuggerKitAspect()
setPriority(28000);
}
QVariant DebuggerKitAspect::defaultValue(const Kit *k) const
{
const Abi toolChainAbi = ToolChainKitAspect::targetAbi(k);
const Utils::FileNameList paths = Environment::systemEnvironment().path();
QVariant nextBestFit;
for (const DebuggerItem &item : DebuggerItemManager::debuggers()) {
for (const Abi &targetAbi : item.abis()) {
if (targetAbi.isCompatibleWith(toolChainAbi)) {
if (paths.contains(item.command()))
return item.id(); // prefer debuggers found in PATH over those found elsewhere
if (nextBestFit.isNull())
nextBestFit = item.id();
}
}
}
return nextBestFit;
}
QVariant DebuggerKitAspect::defaultValue(const Kit *) const { return QVariant(); }
void DebuggerKitAspect::setup(Kit *k)
{