summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-02-25 15:11:45 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-12 14:08:27 +0100
commit64d03e1c3400baf15a2e281142297aa8fe940d48 (patch)
treec2a264b7d549ecd0b8d4179c318d145e596f7bc5 /qmake/generators
parentc1771a78ed0ceab26891b3fdf801dc5557173fac (diff)
do not append a trailing slash to output directory
it's entirely counterproductive and confuses the subsequent code. Change-Id: Iadcfd2af80acd2d7ed50807b3e001e26d83075a5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/metamakefile.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index e3fa39c7e4..b0c3b0681d 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -387,8 +387,6 @@ SubdirsMetaMakefileGenerator::write()
const Subdir *sub = subs.at(i);
qmake_setpwd(subs.at(i)->input_dir);
Option::output_dir = QFileInfo(subs.at(i)->output_dir).absoluteFilePath();
- if(Option::output_dir.at(Option::output_dir.length()-1) != QLatin1Char('/'))
- Option::output_dir += QLatin1Char('/');
Option::output.setFileName(subs.at(i)->output_file);
if(i != subs.count()-1) {
for (int ind = 0; ind < sub->indent; ++ind)