summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-10-14 12:55:28 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-10-14 12:55:28 +0200
commitd2c7193107a170e2884db52272f4d0ee0da62856 (patch)
treedb106605c1566624479a6a144e6157d97f80cdde /qmake
parent480b2f4c79160afaac7934936d3ae6ea382ae2bb (diff)
support the obj-c #import statement in the dependency generator
Task-number: QTBUG-21965 Reviewed-by: joerg
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/makefiledeps.cpp3
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;