Added missing no_include_pwd check

Merge-request: 2619
Reviewed-by: ossi
(cherry picked from commit 9db6959f8893a64146124db0cfafbcb154a9e105)

Change-Id: I096013754bd78f5fcf8afcc3ae8734abc959c107
Reviewed-on: http://codereview.qt-project.org/4582
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 4d4fae0..1176ffa 100644 (file)
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -784,7 +784,7 @@ MakefileGenerator::init()
             (*it) = Option::fixPathToLocalOS((*it));
     }
 
-    { //get the output_dir into the pwd
+    if(!project->isActiveConfig("no_include_pwd")) { //get the output_dir into the pwd
         if(Option::output_dir != qmake_getpwd())
             project->values("INCLUDEPATH").append(".");
     }