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

Merge commit 'origin/1.3'

Browse Source 
Conflicts:
	src/plugins/cppeditor/cppeditor.cpp
This commit is contained in:
mae
2009-12-03 18:41:21 +01:00
parent 480c9a5bf4 3ef326369c
commit c1120587a8
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/cplusplus/pp-engine.cpp
View File

@@ -747,7 +747,7 @@ bool Preprocessor::markGeneratedTokens(bool markGeneratedTokens,
out(*it);
}
if (! markGeneratedTokens && dot->newline())
if (! markGeneratedTokens && dot->f.newline)
processNewline(/*force = */ true);
}