Merge remote-tracking branch 'origin/4.3'

Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
This commit is contained in:
Orgad Shaneh
2017-06-20 11:30:21 +03:00
48 changed files with 3004 additions and 2039 deletions

View File

@@ -300,6 +300,11 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
}
QString QbsRunConfiguration::buildSystemTarget() const
{
return productDisplayNameFromId(id());
}
QString QbsRunConfiguration::uniqueProductName() const
{
return m_uniqueProductName;
}