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

Merge remote-tracking branch 'origin/12.0' into 13.0

Browse Source 
Conflicts:
	src/plugins/ios/iosdevice.cpp
	src/plugins/texteditor/bookmarkmanager.cpp

Change-Id: I92931f29c3992054dac84dbfa2dfc0c1bfb31430
This commit is contained in:
Eike Ziller
2024-02-05 10:52:42 +01:00
parent b5b87cbd12 a45f058a37
commit 220237d029
7 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,11 @@ static QString fileNameToPresetName(const QString &fileName)
return name;
}
static QString displayPresetName(const QString &presetName)
{
return QString("%1 (CMake preset)").arg(presetName);
}
FilePaths CMakeProjectImporter::importCandidates()
{
FilePaths candidates;
@@ -964,6 +969,9 @@ bool CMakeProjectImporter::matchKit(void *directoryData, const Kit *k) const
if (data->cmakePreset != presetName)
return false;
if (!k->unexpandedDisplayName().contains(displayPresetName(data->cmakePresetDisplayname)))
return false;
ensureBuildDirectory(*data, k);
haveCMakePreset = true;
}
@@ -1006,8 +1014,7 @@ Kit *CMakeProjectImporter::createKit(void *directoryData) const
}
if (!data->cmakePresetDisplayname.isEmpty()) {
k->setUnexpandedDisplayName(
QString("%1 (CMake preset)").arg(data->cmakePresetDisplayname));
k->setUnexpandedDisplayName(displayPresetName(data->cmakePresetDisplayname));
CMakeConfigurationKitAspect::setCMakePreset(k, data->cmakePreset);
}