summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-03-29 08:22:10 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-04-12 10:00:24 (GMT)
commitaf93be4d81d1e50b0c9f015f8432033cc737b22d (patch)
treeb8aa1be50b12a31edb3dfc48f9d50c563f09fdf7
parent11604357fccb59f7aba8165ea7ca8846eb820858 (diff)
downloadQt-af93be4d81d1e50b0c9f015f8432033cc737b22d.zip
Qt-af93be4d81d1e50b0c9f015f8432033cc737b22d.tar.gz
Qt-af93be4d81d1e50b0c9f015f8432033cc737b22d.tar.bz2
simplify: the input and output dirs are already normalized
Reviewed-by: mariusSO
-rw-r--r--qmake/generators/makefile.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 9c22ca4..7033a04 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -782,7 +782,7 @@ MakefileGenerator::init()
}
{ //get the output_dir into the pwd
- if(fileFixify(Option::output_dir) != fileFixify(qmake_getpwd()))
+ if(Option::output_dir != qmake_getpwd())
project->values("INCLUDEPATH").append(fileFixify(Option::output_dir,
Option::output_dir,
Option::output_dir));