diff options
| author | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-11-26 10:31:28 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-12-15 16:40:02 +0000 |
| commit | 209a26c6c4187a15cc6297000ad729392aac6454 (patch) | |
| tree | 236d83514325e4eb818fc42233793cbec6f01e4a /qmake | |
| parent | 769027dcb3d9bd9f6a0fa7a97adf9ea3142904c4 (diff) | |
qmake: Fix comment false-alarm bug in findMocs().
If a / wasn't part of a comment-start, it and the character after it
were none the less stepped over. If the character after started an
enclosure, this would duly be missed, leading to mis-parsing of the
subsequent text. As for similar bug recently fixed in findDeps().
Change-Id: Ie5329ec633c23a554b42a6351723c980e27fb9a9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefiledeps.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index 656acdc6ba..53e0954749 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -919,6 +919,8 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file) ++line_count; } } + } else { // not a comment, in fact; undo the extra x++ we did. + x--; } } } else if (buffer[x] == '\'' || buffer[x] == '"') { |