diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-15 23:00:31 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-15 23:00:31 (GMT) |
| commit | ec9a31abf003880a60d1120738a3bee7075b8ca8 (patch) | |
| tree | 305e37cd24311014bfe89381c4f16389a7d42e90 | |
| parent | 939c66a788c5ab3bbd630732f5c85c50bb80ce1a (diff) | |
| parent | bb47d070b0ad0cccd3a60b6344292f97164c9231 (diff) | |
| download | Qt-ec9a31abf003880a60d1120738a3bee7075b8ca8.zip Qt-ec9a31abf003880a60d1120738a3bee7075b8ca8.tar.gz Qt-ec9a31abf003880a60d1120738a3bee7075b8ca8.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
| -rw-r--r-- | qmake/generators/makefiledeps.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index f9cbed1..4f4c1ff 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -568,7 +568,8 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file) keyword_len++; } - if(keyword_len == 7 && !strncmp(keyword, "include", keyword_len)) { + if((keyword_len == 7 && !strncmp(keyword, "include", 7)) // C & Obj-C + || (keyword_len == 6 && !strncmp(keyword, "import", 6))) { // Obj-C char term = *(buffer + x); if(term == '<') { try_local = false; |