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>
This commit is contained in:
parent
5dd78ba08f
commit
c4c8bd26bd
@ -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(".");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user