diff options
| author | Styopa Semenukha <semenukha@gmail.com> | 2011-08-12 21:19:26 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-08-18 11:02:54 +0200 |
| commit | 9db6959f8893a64146124db0cfafbcb154a9e105 (patch) | |
| tree | de8afc58c02968de426f88d2c0eb441b8e5af77b /qmake | |
| parent | 81f0c44f6a4fd4cfa41af5d5b292008185bf3981 (diff) | |
| download | qt4-tools-9db6959f8893a64146124db0cfafbcb154a9e105.tar.gz | |
Added missing no_include_pwd check
Merge-request: 2619
Reviewed-by: ossi
Diffstat (limited to 'qmake')
| -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 00f6b4ae29..eda489fcb3 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("."); } |