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

VPATH resolution: don't crash when $(FOO) expands to nothing

Browse Source 
Task-number: QTBUG-29988
Change-Id: Ice3dc28002fc70e70fecc5d61bd0b32260ac0d50
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-07-04 10:40:57 +02:00 committed by The Qt Project
parent b30273ec4a
commit d149ceef4a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/makefile.cpp
View File

@ -317,6 +317,10 @@ MakefileGenerator::findFilesInVPATH(ProStringList l, uchar flags, const QString
if(!val.isEmpty()) { if(!val.isEmpty()) {
QString qval = val.toQString(); QString qval = val.toQString();
QString file = fixEnvVariables(qval); QString file = fixEnvVariables(qval);
if (file.isEmpty()) {
++val_it;
continue;
}
if(!(flags & VPATH_NoFixify)) if(!(flags & VPATH_NoFixify))
file = fileFixify(file, qmake_getpwd(), Option::output_dir); file = fileFixify(file, qmake_getpwd(), Option::output_dir);
if (file.at(0) == '\"' && file.at(file.length() - 1) == '\"') if (file.at(0) == '\"' && file.at(file.length() - 1) == '\"')