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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Change-Id: I3e7049da2c3da6f784e3cb3407c22ada556e5d24
This commit is contained in:
Eike Ziller
2020-02-26 08:35:05 +01:00
parent 23946de457 fa59e02f89
commit 61dc14b67f
419 changed files with 18939 additions and 2729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -1232,15 +1232,11 @@ void QmakeBuildSystem::testToolChain(ToolChain *tc, const FilePath &path) const
const Utils::FilePath expected = tc->compilerCommand();
Environment env = Environment::systemEnvironment();
Target *t = target();
QTC_ASSERT(t, return);
Kit *k = t->kit();
if (BuildConfiguration *bc = t->activeBuildConfiguration())
env = bc->environment();
else
k->addToEnvironment(env);
QTC_ASSERT(m_buildConfiguration, return);
Environment env = m_buildConfiguration->environment();
if (env.isSameExecutable(path.toString(), expected.toString()))
return;
@@ -1261,7 +1257,9 @@ void QmakeBuildSystem::testToolChain(ToolChain *tc, const FilePath &path) const
"\"%1\" is used by qmake, but \"%2\" is configured in the kit.\n"
"Please update your kit (%3) or choose a mkspec for qmake that matches "
"your target environment better.")
.arg(path.toUserOutput()).arg(expected.toUserOutput()).arg(k->displayName())));
.arg(path.toUserOutput())
.arg(expected.toUserOutput())
.arg(t->kit()->displayName())));
m_toolChainWarnings.insert(pair);
}