summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2010-09-01 15:35:51 +0200
committerErik Verbruggen <erik.verbruggen@nokia.com>2010-09-01 15:36:36 +0200
commit45d7eb9a192cdc66b63f729b5679b1adf3bfb707 (patch)
treeb2c4067a6229e9506e4d4f39ddc1bb32ee5a5a56 /src/shared
parent7ccab966e7adf50e5c1a4939feaf5b33df457fb9 (diff)
downloadqt-creator-45d7eb9a192cdc66b63f729b5679b1adf3bfb707.tar.gz
Fixed invalid skipping of pound tokens.
Done-with: Roberto Raggi
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/cplusplus/TranslationUnit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/cplusplus/TranslationUnit.cpp b/src/shared/cplusplus/TranslationUnit.cpp
index f8c597051d..a68ef0246a 100644
--- a/src/shared/cplusplus/TranslationUnit.cpp
+++ b/src/shared/cplusplus/TranslationUnit.cpp
@@ -203,7 +203,7 @@ void TranslationUnit::tokenize()
lex(&tk);
_Lrecognize:
- if (tk.is(T_POUND)) {
+ if (tk.is(T_POUND) && tk.newline()) {
unsigned offset = tk.offset;
lex(&tk);