diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-10-14 12:55:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-09 20:35:13 +0100 |
| commit | 76beb4bbb26526dfae277fed4077c5538ee36b32 (patch) | |
| tree | 4060c4807484a26cf09bebbc68b4580d57c4f849 /qmake/generators | |
| parent | b44011fb771337fee23a2a3c588c049aa0c35226 (diff) | |
support the obj-c #import statement in the dependency generator
Task-number: QTBUG-21965
Reviewed-by: joerg
(cherry picked from commit d2c7193107a170e2884db52272f4d0ee0da62856)
Change-Id: I8a5eb47bfd2c2ee9d064f054565915e64e4902f8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
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 f9cbed1465..4f4c1ff57e 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; |