diff options
| author | Sami Lempinen <sami.lempinen@nokia.com> | 2011-08-31 06:42:09 (GMT) |
|---|---|---|
| committer | Sami Lempinen <sami.lempinen@nokia.com> | 2011-08-31 06:42:09 (GMT) |
| commit | 10be762a98bf5d5947128e334405d532a42b3be0 (patch) | |
| tree | 2359dbf112a07a005f913aa46765bbf52b8bff95 /qmake | |
| parent | c95b2b1fe0e5d02145e3cbdba1d88c7bb58a873f (diff) | |
| parent | 1e48d40597bbe12321a5a3e42b3595dc17a7f8e7 (diff) | |
| download | Qt-10be762a98bf5d5947128e334405d532a42b3be0.zip Qt-10be762a98bf5d5947128e334405d532a42b3be0.tar.gz Qt-10be762a98bf5d5947128e334405d532a42b3be0.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/makefiledeps.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index b9de92d..7e14437 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("."); } diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index d6dab0b..f9cbed1 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -499,7 +499,7 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file) } else if(*(buffer+x) == '*') { //c style comment for(++x; x < buffer_len; ++x) { if(*(buffer+x) == '*') { - if(x < buffer_len-1 && *(buffer + (x+1)) == '/') { + if(x+1 < buffer_len && *(buffer + (x+1)) == '/') { ++x; break; } |