diff options
-rw-r--r-- | qmake/generators/makefiledeps.cpp | 2 | ||||
-rw-r--r-- | tests/auto/tools/qmake/testdata/findMocs/object7.h | 1 |
2 files changed, 3 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] == '"') { diff --git a/tests/auto/tools/qmake/testdata/findMocs/object7.h b/tests/auto/tools/qmake/testdata/findMocs/object7.h index 92b4672d6b..3922a542e0 100644 --- a/tests/auto/tools/qmake/testdata/findMocs/object7.h +++ b/tests/auto/tools/qmake/testdata/findMocs/object7.h @@ -33,6 +33,7 @@ /**//*'*/ #include <QObject> +#define bogon /"/*" class Object7 : public QObject { |