1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not add DEPENDPATH to VPATH

Browse Source 
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 <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-11-01 14:50:03 +01:00 committed by The Qt Project
parent 754cf42bb5
commit 90387bb446
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/makefile.cpp
View File

@ -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;
}