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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: Ibb433d3e1ea2c0632dd2f710c8ec995de7599978
This commit is contained in:
Eike Ziller
2023-06-19 10:08:56 +02:00
parent 6c601b8cd4 d30689c9a9
commit f88db30319
65 changed files with 412 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2058,7 +2058,10 @@ void CMakeBuildConfiguration::addToEnvironment(Utils::Environment &env) const
Environment CMakeBuildConfiguration::configureEnvironment() const
{
return aspect<ConfigureEnvironmentAspect>()->environment();
Environment env = aspect<ConfigureEnvironmentAspect>()->environment();
addToEnvironment(env);
return env;
}
QString CMakeBuildSystem::cmakeBuildType() const

11
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -194,7 +194,7 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :
m_useStaging = addAspect<BoolAspect>();
m_useStaging->setSettingsKey(USE_STAGING_KEY);
m_useStaging->setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBox);
m_useStaging->setLabel(Tr::tr("Stage for installation"), BoolAspect::LabelPlacement::AtCheckBox);
m_useStaging->setDefaultValue(!buildAndRunOnSameDevice(kit()));
m_stagingDir = addAspect<FilePathAspect>();
@@ -503,8 +503,10 @@ QWidget *CMakeBuildStep::createConfigWidget()
m_stagingDir->setEnabled(m_useStaging->value());
if (m_useStaging->value()) {
summaryText.append(" " + Tr::tr("and stage at %2 for %3")
.arg(currentStagingDir(), currentInstallPrefix()));
//: Stage (for installation) at <staging_dir> for <installation_dir>
summaryText.append(
"; "
+ Tr::tr("Stage at %2 for %3").arg(currentStagingDir(), currentInstallPrefix()));
}
if (!m_buildPreset.isEmpty()) {
@@ -567,7 +569,8 @@ QWidget *CMakeBuildStep::createConfigWidget()
Layouting::Form builder;
builder.addRow({m_cmakeArguments});
builder.addRow({m_toolArguments});
builder.addRow({Tr::tr("Stage for installation:"), Layouting::Row{m_useStaging, m_stagingDir}});
builder.addRow({m_useStaging});
builder.addRow({m_stagingDir});
if (m_useiOSAutomaticProvisioningUpdates)
builder.addRow({m_useiOSAutomaticProvisioningUpdates});

24
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -233,18 +233,18 @@ void CMakeManager::reloadCMakePresets()
{
auto settings = CMakeSpecificSettings::instance();
QMessageBox::StandardButton clickedButton
= CheckableMessageBox::question(Core::ICore::dialogParent(),
Tr::tr("Reload CMake Presets"),
Tr::tr("Re-generates the CMake presets kits. The manual "
"CMake project modifications will be lost."),
settings->askBeforePresetsReload.checkableDecider(),
QMessageBox::Yes | QMessageBox::Cancel,
QMessageBox::Yes,
QMessageBox::Yes,
{
{QMessageBox::Yes, Tr::tr("Reload")},
});
QMessageBox::StandardButton clickedButton = CheckableMessageBox::question(
Core::ICore::dialogParent(),
Tr::tr("Reload CMake Presets"),
Tr::tr("Re-generates the kits that were created for CMake presets. All manual "
"modifications to the CMake project settings will be lost."),
settings->askBeforePresetsReload.checkableDecider(),
QMessageBox::Yes | QMessageBox::Cancel,
QMessageBox::Yes,
QMessageBox::Yes,
{
{QMessageBox::Yes, Tr::tr("Reload")},
});
if (clickedButton == QMessageBox::Cancel)
return;