From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 18 May 2012 19:51:02 +0000 (+0200)
Subject: fix in-/out-dir mixup
X-Git-Tag: 071012110112~338^2^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46d35cc5662f48605d24ec76f97319b3df6f62b4;p=profile%2Fivi%2Fqtbase.git

fix in-/out-dir mixup

no point in entering the outdir and leaving the indir.
this doesn't really matter except for the obsolete borland generator,
but whatever.

Change-Id: Ieb4e4c549ebd65f99e4d00819c52822968b060a4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index bddcdf7..81835a5 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2432,7 +2432,6 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
         if(!in_directory.isEmpty())
             mkfile.prepend(out_directory);
 
-        QString in_directory_cdin, in_directory_cdout, out_directory_cdin, out_directory_cdout;
 #define MAKE_CD_IN_AND_OUT(directory) \
         if(!directory.isEmpty()) {               \
             if(project->isActiveConfig("cd_change_global")) { \
@@ -2453,7 +2452,8 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
         } else { \
             directory ## _cdin = "\n\t"; \
         }
-        MAKE_CD_IN_AND_OUT(in_directory);
+
+        QString out_directory_cdin, out_directory_cdout;
         MAKE_CD_IN_AND_OUT(out_directory);
 
         QString makefilein = " -f " + subtarget->makefile;
@@ -2469,7 +2469,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
                 t << mkdir_p_asstring(out_directory)
                   << out_directory_cdin
                   << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out
-                  << in_directory_cdout << endl;
+                  << out_directory_cdout << endl;
             } else {
                 t << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out << endl;
             }
@@ -2488,7 +2488,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
                 t << mkdir_p_asstring(out_directory)
                   << out_directory_cdin
                   << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out
-                  << in_directory_cdout;
+                  << out_directory_cdout;
             } else {
                 t << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out;
             }