AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added missing no_include_pwd check

Browse Source 
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:
Styopa Semenukha 2011-08-12 21:19:26 +02:00 committed by Qt by Nokia
parent 5dd78ba08f
commit c4c8bd26bd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/makefile.cpp
View File

@ -784,7 +784,7 @@ MakefileGenerator::init()
(*it) = Option::fixPathToLocalOS((*it)); (*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()) if(Option::output_dir != qmake_getpwd())
project->values("INCLUDEPATH").append("."); project->values("INCLUDEPATH").append(".");
} }