From cefaf61edac309216b7ff6c170602f5474aa1209 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 9 Jan 2015 13:02:39 +0100 Subject: [PATCH] remove pointless pwd fallbacks neither qmake_getpwd()'s return value nor a fileFixify()'d version of it can be empty. Change-Id: Ic3b7d20becc57209b9dbe71ad9dc8e7547d435b1 Reviewed-by: Thiago Macieira --- qmake/generators/mac/pbuilder_pbx.cpp | 2 -- qmake/generators/makefile.cpp | 2 -- qmake/generators/unix/unixmake2.cpp | 2 -- qmake/generators/win32/mingw_make.cpp | 2 -- 4 files changed, 8 deletions(-) diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 0ff42500de2..f80c3e84c82 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -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; } { diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 4c501983d8c..e34b820a8be 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -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 deplist; diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 9165da4d386..3f9df31a1c7 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -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; } { diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 3c53421fc41..9bb5b1e4169 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -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 << " "; }