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

Merge remote-tracking branch 'origin/9.0' into 10.0

Browse Source 
Conflicts:
	src/plugins/texteditor/codestyleselectorwidget.cpp
	src/plugins/updateinfo/updateinfoplugin.cpp

Change-Id: Iac33b852ccef6018bd81188716526aa70c3f5a2d
This commit is contained in:
Eike Ziller
2023-02-10 10:29:14 +01:00
parent 3d57b1868b ff65caf62f
commit b29cb4efe1
6 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,8 +61,9 @@ static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools()
if (HostOsInfo::isMacHost()) {
path.append("/Applications/CMake.app/Contents/bin");
path.append("/usr/local/bin");
path.append("/opt/local/bin");
path.append("/usr/local/bin"); // homebrew intel
path.append("/opt/homebrew/bin"); // homebrew arm
path.append("/opt/local/bin"); // macports
}
FilePaths suspects;

2
src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
View File

@@ -95,7 +95,7 @@ void ConfigModelItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *
if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) {
auto edit = static_cast<PathChooser *>(editor);
if (edit->rawFilePath().toString() != data.value)
model->setData(index, edit->filePath().toString(), Qt::EditRole);
model->setData(index, edit->rawFilePath().toString(), Qt::EditRole);
return;
} else if (!data.values.isEmpty()) {
auto edit = static_cast<QComboBox *>(editor);