diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-14 21:35:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-14 21:35:55 (GMT) |
| commit | bb47d070b0ad0cccd3a60b6344292f97164c9231 (patch) | |
| tree | ea99a9190065b35af5446dfadad497f65f686ab0 /qmake/generators | |
| parent | 94d0bed992aad8e8a6edda129d4a75f9b4ffa163 (diff) | |
| parent | d2c7193107a170e2884db52272f4d0ee0da62856 (diff) | |
| download | Qt-bb47d070b0ad0cccd3a60b6344292f97164c9231.zip Qt-bb47d070b0ad0cccd3a60b6344292f97164c9231.tar.gz Qt-bb47d070b0ad0cccd3a60b6344292f97164c9231.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
support the obj-c #import statement in the dependency generator
Diffstat (limited to 'qmake/generators')
| -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; |