Merge remote branch 'origin/1.3'

2009-12-03 15:15:08 +01:00
parent 36b6810c74 42f849c4da
commit 8b9c748abb
8 changed files with 30 additions and 15 deletions
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -746,6 +746,9 @@ bool Preprocessor::markGeneratedTokens(bool markGeneratedTokens,
            else
                out(*it);
        }
+
+        if (! markGeneratedTokens && dot->newline())
+            processNewline(/*force = */ true);
    }

    return previous;