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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Change-Id: Ib8a52ad56c4d74542c5a4c283699f6afca2ed6ae
This commit is contained in:
Orgad Shaneh
2018-03-02 10:03:29 +02:00
parent a2edfda1ca 0db9df2806
commit 891e618c5a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@ void DebuggerKitInformation::setup(Kit *k)
// This improves the situation a bit if a cross-compilation tool chain has the // This improves the situation a bit if a cross-compilation tool chain has the
// same ABI as the host. // same ABI as the host.
if (level == DebuggerItem::MatchesPerfectly if (level == DebuggerItem::MatchesPerfectly
&& systemEnvironment.path().contains(item.command().parentDir().toString())) { && systemEnvironment.path().contains(item.command().parentDir())) {
level = DebuggerItem::MatchesPerfectlyInPath; level = DebuggerItem::MatchesPerfectlyInPath;
} }
} else if (rawId.type() == QVariant::String) { } else if (rawId.type() == QVariant::String) {

2
src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
View File

@@ -104,7 +104,7 @@ void QmakeKitInformation::setup(Kit *k)
const Environment systemEnvironment = Environment::systemEnvironment(); const Environment systemEnvironment = Environment::systemEnvironment();
ToolChain *bestTc = Utils::findOrDefault(goodTcs, ToolChain *bestTc = Utils::findOrDefault(goodTcs,
[&systemEnvironment](const ToolChain *t) { [&systemEnvironment](const ToolChain *t) {
return systemEnvironment.path().contains(t->compilerCommand().parentDir().toString()); return systemEnvironment.path().contains(t->compilerCommand().parentDir());
}); });
if (!bestTc) { if (!bestTc) {
bestTc = goodTcs.isEmpty() ? possibleTcs.last() : goodTcs.last(); bestTc = goodTcs.isEmpty() ? possibleTcs.last() : goodTcs.last();