diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-10-21 09:13:03 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-10-21 09:13:03 +0200 |
| commit | bb9774de92dd2c8da85c5231ca5646b078cb42a3 (patch) | |
| tree | e43470cf6f3a7c965b7dc8a349593dadd03ee65e /src/plugins/clangformat/clangformatfile.cpp | |
| parent | f41bebc843a8b4ab1ab29562ba200b032b5ab5ac (diff) | |
| parent | 5377253612801b2f92e0b55e40c3ce0dd2574b09 (diff) | |
Merge remote-tracking branch 'origin/6.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: If8baed5564470e550a0ba5c7720915217eec2412
Diffstat (limited to 'src/plugins/clangformat/clangformatfile.cpp')
| -rw-r--r-- | src/plugins/clangformat/clangformatfile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/clangformat/clangformatfile.cpp b/src/plugins/clangformat/clangformatfile.cpp index 8e532ea797..c9955ef2a3 100644 --- a/src/plugins/clangformat/clangformatfile.cpp +++ b/src/plugins/clangformat/clangformatfile.cpp @@ -105,7 +105,7 @@ void ClangFormatFile::saveNewFormat() // workaround: configurationAsText() add comment "# " before BasedOnStyle line const int pos = style.find("# BasedOnStyle"); - if (pos < style.size()) + if (pos < int(style.size())) style.erase(pos, 2); m_filePath.writeFileContents(QByteArray::fromStdString(style)); } |