diff options
author | Styopa Semenukha <semenukha@gmail.com> | 2011-08-12 21:19:26 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-12 16:03:47 +0200 |
commit | c4c8bd26bdd1921b9d60399ce4b723eb41483d01 (patch) | |
tree | bc26b8f057c3a99761bcdb445286312b496e9acc /qmake/generators/makefile.cpp | |
parent | 5dd78ba08f31f9aa3c13d4e05ad4478033f7f4e8 (diff) |
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>
Diffstat (limited to 'qmake/generators/makefile.cpp')
-rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 4d4fae0c10..1176ffa0f9 100644 --- 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("."); } |