AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove pointless pwd fallbacks

Browse Source 
neither qmake_getpwd()'s return value nor a fileFixify()'d version of it
can be empty.

Change-Id: Ic3b7d20becc57209b9dbe71ad9dc8e7547d435b1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2015-01-09 13:02:39 +01:00 committed by Thiago Macieira
parent 2924279c23
commit cefaf61eda
4 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -742,8 +742,6 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
mkt << "INCPATH = -I" << specdir();
if(!project->isActiveConfig("no_include_pwd")) {
QString pwd = escapeFilePath(fileFixify(qmake_getpwd()));
if(pwd.isEmpty())
pwd = ".";
mkt << " -I" << pwd;
}
{

2
qmake/generators/makefile.cpp
View File

@ -795,8 +795,6 @@ MakefileGenerator::init()
incDirs += v["INCLUDEPATH"];
if(!project->isActiveConfig("no_include_pwd")) {
QString pwd = qmake_getpwd();
if(pwd.isEmpty())
pwd = ".";
incDirs += pwd;
}
QList<QMakeLocalFileName> deplist;

2
qmake/generators/unix/unixmake2.cpp
View File

@ -187,8 +187,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << "INCPATH = -I" << specdir();
if(!project->isActiveConfig("no_include_pwd")) {
QString pwd = escapeFilePath(fileFixify(qmake_getpwd()));
if(pwd.isEmpty())
pwd = ".";
t << " -I" << pwd;
}
{

2
qmake/generators/win32/mingw_make.cpp
View File

@ -308,8 +308,6 @@ void MingwMakefileGenerator::writeIncPart(QTextStream &t)
if (!project->isActiveConfig("no_include_pwd")) {
QString pwd = escapeFilePath(fileFixify(qmake_getpwd()));
if (pwd.isEmpty())
pwd = ".";
t << "-I" << pwd << " ";
}