summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-01-09 13:02:39 +0100
committerThiago Macieira <thiago.macieira@intel.com>2015-01-11 03:35:28 +0100
commitcefaf61edac309216b7ff6c170602f5474aa1209 (patch)
tree298d93a5595deb91398222e0ae4e9387fb917d33 /qmake
parent2924279c235e9cb12b58b0f3ae0b139f8ac5ac2c (diff)
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 <thiago.macieira@intel.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/mac/pbuilder_pbx.cpp2
-rw-r--r--qmake/generators/makefile.cpp2
-rw-r--r--qmake/generators/unix/unixmake2.cpp2
-rw-r--r--qmake/generators/win32/mingw_make.cpp2
4 files changed, 0 insertions, 8 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 0ff42500de..f80c3e84c8 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 4c501983d8..e34b820a8b 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<QMakeLocalFileName> deplist;
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 9165da4d38..3f9df31a1c 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 3c53421fc4..9bb5b1e416 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 << " ";
}