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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	share/qtcreator/debugger/creatortypes.py
	src/plugins/beautifier/clangformat/clangformat.cpp

Change-Id: I1ab281c190767ced8a6ac2c026a121ea229a36cf
This commit is contained in:
Eike Ziller
2016-05-11 13:28:35 +02:00
parent 3d9ef5c813 d8e38131b7
commit 3d751dcf44
7 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/beautifier/clangformat/clangformat.cpp
View File

@@ -128,7 +128,7 @@ Command ClangFormat::command(int offset, int length) const
if (m_settings->usePredefinedStyle()) {
command.addOption("-style=" + m_settings->predefinedStyle());
command.addOption("-assume-filename=%filename");
command.addOption("-assume-filename=%file");
} else {
command.addOption("-style=file");
const QString path =