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>
This commit is contained in:
parent
b30273ec4a
commit
d149ceef4a
@ -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) == '\"')
|
||||
|
Loading…
x
Reference in New Issue
Block a user