From 209a26c6c4187a15cc6297000ad729392aac6454 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 26 Nov 2015 10:31:28 +0100 Subject: 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 --- qmake/generators/makefiledeps.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qmake') 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] == '"') { -- cgit v1.2.3