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 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: Ide0650d70d5dbd32a5492c8db24089925251af12
This commit is contained in:
Eike Ziller
2023-06-12 12:33:26 +02:00
parent 74f77f6407 890debd658
commit ea56417410
68 changed files with 1125 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/clangformat/clangformatconfigwidget.cpp
View File

@@ -207,7 +207,7 @@ void ClangFormatConfigWidget::createStyleFileIfNeeded(bool isGlobal)
if (configFile.exists())
return;
QDir().mkpath(path.toString());
path.ensureWritableDir();
if (!isGlobal) {
FilePath possibleProjectConfig = d->project->rootProjectDirectory()
/ Constants::SETTINGS_FILE_NAME;
@@ -218,11 +218,8 @@ void ClangFormatConfigWidget::createStyleFileIfNeeded(bool isGlobal)
}
}
std::fstream newStyleFile(configFile.toString().toStdString(), std::fstream::out);
if (newStyleFile.is_open()) {
newStyleFile << clang::format::configurationAsText(constructStyle());
newStyleFile.close();
}
const std::string config = clang::format::configurationAsText(constructStyle());
configFile.writeFileContents(QByteArray::fromStdString(config));
}
void ClangFormatConfigWidget::showOrHideWidgets()