diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-04 10:40:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-04 18:13:05 +0200 |
| commit | d149ceef4a3549ddd2a3267ec160bab1d9f939e8 (patch) | |
| tree | ab8cabc6a2aba93f5f2bb8823dd99bc9bb3337e6 /qmake/generators/makefile.cpp | |
| parent | b30273ec4a4ce65794fd402c6e3eb21de7bae1b9 (diff) | |
VPATH resolution: don't crash when $(FOO) expands to nothing
Task-number: QTBUG-29988
Change-Id: Ice3dc28002fc70e70fecc5d61bd0b32260ac0d50
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index d095bdf83d..f65f98f42b 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -317,6 +317,10 @@ MakefileGenerator::findFilesInVPATH(ProStringList l, uchar flags, const QString if(!val.isEmpty()) { QString qval = val.toQString(); QString file = fixEnvVariables(qval); + if (file.isEmpty()) { + ++val_it; + continue; + } if(!(flags & VPATH_NoFixify)) file = fileFixify(file, qmake_getpwd(), Option::output_dir); if (file.at(0) == '\"' && file.at(file.length() - 1) == '\"') |