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

CMakePM: Rename "Additional CMake parameters" to "... options"

Browse Source 
CMake documentation calls them Options, and we should use the same
terminology.

See https://cmake.org/cmake/help/v3.22/manual/cmake.1.html?#options

Change-Id: Ibb8ed9dd5a830290770a7fa89e7e5e1ce2d8c74a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2022-02-03 11:24:56 +01:00
parent 633a9a04e2
commit 8d12fd07e2
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -942,7 +942,7 @@ private:
m_additionalEditor = new QLineEdit;
auto additionalLabel = new QLabel(m_dialog);
additionalLabel->setText(tr("Additional CMake parameters: "));
additionalLabel->setText(tr("Additional CMake options: "));
auto additionalChooser = new VariableChooser(m_dialog);
additionalChooser->addSupportedWidget(m_additionalEditor);
@@ -984,16 +984,16 @@ private:
QTC_ASSERT(m_editor, return);
KitGuard guard(kit());
QStringList unknownArguments;
QStringList unknownOptions;
const CMakeConfig config = CMakeConfig::fromArguments(m_editor->toPlainText().split('\n'),
unknownArguments);
unknownOptions);
CMakeConfigurationKitAspect::setConfiguration(kit(), config);
QString additionalConfiguration = m_additionalEditor->text();
if (!unknownArguments.isEmpty()) {
if (!unknownOptions.isEmpty()) {
if (!additionalConfiguration.isEmpty())
additionalConfiguration += " ";
additionalConfiguration += ProcessArgs::joinArgs(unknownArguments);
additionalConfiguration += ProcessArgs::joinArgs(unknownOptions);
}
CMakeConfigurationKitAspect::setAdditionalConfiguration(kit(), additionalConfiguration);
}