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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Change-Id: Ib2267ddbb702564a6e1c8f6b1db802bc9c45759d
This commit is contained in:
Eike Ziller
2022-03-31 15:32:42 +02:00
parent afd70a2c67 17ef9bc35c
commit c84380cdc8
26 changed files with 324 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -620,7 +620,7 @@ void CMakeBuildSettingsWidget::updateInitialCMakeArguments()
*it = ci;
if (ci.isUnset)
initialList.erase(it);
} else {
} else if (!ci.key.isEmpty()) {
initialList.push_back(ci);
}
}
@@ -1105,7 +1105,7 @@ static CommandLine defaultInitialCMakeCommand(const Kit *k, const QString buildT
if (ToolChain *tc = ToolChainKitAspect::cxxToolChain(k)) {
const QString targetTriple = tc->originalTargetTriple();
cmd.addArg("-DCMAKE_C_COMPILER_TARGET:STRING=" + targetTriple);
cmd.addArg("-DCMAKE_CXX_COMPILER_TARGET:STRING=%1" + targetTriple);
cmd.addArg("-DCMAKE_CXX_COMPILER_TARGET:STRING=" + targetTriple);
}
}
}

8
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -1122,8 +1122,12 @@ void CMakeConfigurationKitAspect::fromStringList(Kit *k, const QStringList &in)
QStringList CMakeConfigurationKitAspect::toArgumentsList(const Kit *k)
{
return Utils::transform(CMakeConfigurationKitAspect::configuration(k).toList(),
[](const CMakeConfigItem &i) { return i.toArgument(nullptr); });
QStringList current = Utils::transform(CMakeConfigurationKitAspect::configuration(k).toList(),
[](const CMakeConfigItem &i) {
return i.toArgument(nullptr);
});
current = Utils::filtered(current, [](const QString &s) { return s != "-D" || s != "-U"; });
return current;
}
CMakeConfig CMakeConfigurationKitAspect::defaultConfiguration(const Kit *k)