From 90387bb4461f46b8c725c55066247fba5fbd152f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 1 Nov 2012 14:50:03 +0100 Subject: do not add DEPENDPATH to VPATH DEPENDPATH merely says where to look for impliciit dependencies, not where to find explicit ones. fwiw, the other way round may be considered correct, but DEPENDPATH exists for the sole purpose of limiting which paths should cause recompilations, so it would be counterproductive to extend with with VPATH. Task-number: QTBUG-11912 Change-Id: I86450b5fd5aeb1f1b015b53f0adcd167ff4ce04d Reviewed-by: Joerg Bornemann --- qmake/generators/makefile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 9b32f0e8fd..ad1d319835 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -341,7 +341,7 @@ MakefileGenerator::findFilesInVPATH(ProStringList l, uchar flags, const QString if(vpath.isEmpty()) { if(!vpath_var.isEmpty()) vpath = v[ProKey(vpath_var)]; - vpath += v["VPATH"] + v["QMAKE_ABSOLUTE_SOURCE_PATH"] + v["DEPENDPATH"]; + vpath += v["VPATH"] + v["QMAKE_ABSOLUTE_SOURCE_PATH"]; if(Option::output_dir != qmake_getpwd()) vpath << Option::output_dir; } -- cgit v1.2.3