summaryrefslogtreecommitdiffstats
path: root/qmake/generators/metamakefile.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-09 13:43:50 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-07-17 17:54:58 (GMT)
commitb09f6312060ca24ccd5702f43a129b92e8b3d705 (patch)
treeaa5ce9e64d833a2f750eb44f2fc21304352d33dc /qmake/generators/metamakefile.cpp
parent11abe2114aca5bc07d797680550d08ce268ff353 (diff)
downloadQt-b09f6312060ca24ccd5702f43a129b92e8b3d705.zip
Qt-b09f6312060ca24ccd5702f43a129b92e8b3d705.tar.gz
Qt-b09f6312060ca24ccd5702f43a129b92e8b3d705.tar.bz2
some directory separator cleanup
- don't duplicate slashes during path concatenation - always use forward slashes when dealing with Option::output_dir - rely on Option::output_dir being normalized at all times still a *very* long way to go, for which we have no time now. Reviewed-by: mariusSO
Diffstat (limited to 'qmake/generators/metamakefile.cpp')
-rw-r--r--qmake/generators/metamakefile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 7f4e914..34d3698 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -293,9 +293,9 @@ SubdirsMetaMakefileGenerator::init()
init_flag = true;
if(Option::recursive) {
- QString old_output_dir = QDir::cleanPath(Option::output_dir);
+ QString old_output_dir = Option::output_dir;
QString old_output = Option::output.fileName();
- QString oldpwd = QDir::cleanPath(qmake_getpwd());
+ QString oldpwd = qmake_getpwd();
QString thispwd = oldpwd;
if(!thispwd.endsWith('/'))
thispwd += '/';