diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-09 13:10:45 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-11 13:52:42 (GMT) |
| commit | 9d2e3f87aba9e87437c27ef94c9215f8b916bd6a (patch) | |
| tree | ea9c82f18acf820ebbfc61192f1c8c622a570ea6 | |
| parent | 6c517a19c67164cab1b29654080b20cf8ff9b8cf (diff) | |
| download | Qt-9d2e3f87aba9e87437c27ef94c9215f8b916bd6a.zip Qt-9d2e3f87aba9e87437c27ef94c9215f8b916bd6a.tar.gz Qt-9d2e3f87aba9e87437c27ef94c9215f8b916bd6a.tar.bz2 | |
do not append trailing slash to OUT_PWD in nested pro-files
the top-level one doesn't have one, either, so this lead to inconsistent
behavior depending on whether the pro was processed directly or from a
SUBDIRS target.
Reviewed-by: mariusSO
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index 3f60791..adbe94a 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -332,8 +332,6 @@ SubdirsMetaMakefileGenerator::init() } qmake_setpwd(sub->input_dir); Option::output_dir = sub->output_dir; - if(Option::output_dir.at(Option::output_dir.length()-1) != QLatin1Char('/')) - Option::output_dir += QLatin1Char('/'); sub_proj->read(subdir.fileName()); if(!sub_proj->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { fprintf(stderr, "Project file(%s) not recursed because all requirements not met:\n\t%s\n", |