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

Merge "Merge remote-tracking branch 'origin/10.0'"

Browse Source
This commit is contained in:
The Qt Project
2023-04-26 09:12:23 +00:00
parent 02d86516c7 fd93ad897f
commit 3a70cb2870
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/fileutils.cpp
View File

@@ -62,6 +62,10 @@ bool FileReader::fetch(const FilePath &filePath, QIODevice::OpenMode mode)
return false; return false;
} }
m_data = *contents; m_data = *contents;
if (mode & QIODevice::Text)
m_data = m_data.replace("\r\n", "\n");
return true; return true;
} }

18
src/plugins/cmakeprojectmanager/presetsparser.cpp
View File

@@ -215,12 +215,24 @@ bool parseConfigurePresets(const QJsonValue &jsonValue,
item.key = cacheKey.toUtf8(); item.key = cacheKey.toUtf8();
item.type = CMakeConfigItem::typeStringToType( item.type = CMakeConfigItem::typeStringToType(
cacheVariableObj.value("type").toString().toUtf8()); cacheVariableObj.value("type").toString().toUtf8());
item.value = cacheVariableObj.value("type").toString().toUtf8(); item.value = cacheVariableObj.value("value").toString().toUtf8();
preset.cacheVariables.value() << item; preset.cacheVariables.value() << item;
} else { } else {
preset.cacheVariables.value() if (cacheValue.isBool()) {
<< CMakeConfigItem(cacheKey.toUtf8(), cacheValue.toString().toUtf8()); preset.cacheVariables.value()
<< CMakeConfigItem(cacheKey.toUtf8(),
CMakeConfigItem::BOOL,
cacheValue.toBool() ? "ON" : "OFF");
} else if (CMakeConfigItem::toBool(cacheValue.toString()).has_value()) {
preset.cacheVariables.value()
<< CMakeConfigItem(cacheKey.toUtf8(),
CMakeConfigItem::BOOL,
cacheValue.toString().toUtf8());
} else {
preset.cacheVariables.value()
<< CMakeConfigItem(cacheKey.toUtf8(), cacheValue.toString().toUtf8());
}
} }
} }