diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-01 14:50:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-02 18:07:35 +0100 |
| commit | 90387bb4461f46b8c725c55066247fba5fbd152f (patch) | |
| tree | eb5fd7fb86cedb965ae62117d3bbe329adb349fd /qmake | |
| parent | 754cf42bb56f3f145fb82b770c5c910dfc0ff5d7 (diff) | |
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 <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |