diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-27 08:27:03 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-27 08:27:53 +0100 |
commit | ea5f40a7880946dd5e3346235d1a8e1a1a8fd42e (patch) | |
tree | 3aadba9965f8a77e2ce4169233b524f091a0e176 /qmake | |
parent | bdf49888ef4044bd513bfd4c888071b41119a6d4 (diff) | |
parent | b13801fd550d4eef2e45ac3e11304571e0146dd9 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ib43c6f126998eefcfed9a7c1f2bcbac8b4dd05ec
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/makefiledeps.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index f4479750c8..0f11745f4c 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -596,14 +596,11 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file) continue; } x++; - - int inc_len; - for (inc_len = 0; - buffer[x + inc_len] != term && !qmake_endOfLine(buffer[x + inc_len]); - ++inc_len) {} // skip until end of include name - buffer[x + inc_len] = '\0'; inc = buffer + x; - x += inc_len; + for (; + buffer[x] != term && !qmake_endOfLine(buffer[x]); + ++x) {} // skip until end of include name + buffer[x] = '\0'; } else if (buffer[x] == '\'' || buffer[x] == '"') { const char term = buffer[x++]; while(x < buffer_len) { |