From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 26 Aug 2013 13:36:34 +0000 (+0200)
Subject: fix setting the output directory for the qmake evaluator
X-Git-Tag: accepted/tizen/20131212.181521~83^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4f09711829789ea1dff8925fb54e12873cc3bb1;p=platform%2Fupstream%2Fqttools.git

fix setting the output directory for the qmake evaluator

not so wise to use the project file instead of its parent directory ...

amends f51f7b7b95

Change-Id: I35b18f81a86d097b82b8184669b0231810c66f73
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---

diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index bf98c8d..c6902c4 100644
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -460,9 +460,6 @@ static void processProjects(bool topLevel, bool nestComplain, const QStringList
         if (!outDirMap.isEmpty())
             option->setDirectories(QFileInfo(proFile).path(), outDirMap[proFile]);
 
-        ProFileEvaluator visitor(option, parser, vfs, &evalHandler);
-        visitor.setCumulative(true);
-        visitor.setOutputDir(option->shadowedPath(proFile));
         ProFile *pro;
         if (!(pro = parser->parsedProFile(proFile, topLevel ? QMakeParser::ParseReportMissing
                                                             : QMakeParser::ParseDefault))) {
@@ -470,6 +467,9 @@ static void processProjects(bool topLevel, bool nestComplain, const QStringList
                 *fail = true;
             continue;
         }
+        ProFileEvaluator visitor(option, parser, vfs, &evalHandler);
+        visitor.setCumulative(true);
+        visitor.setOutputDir(option->shadowedPath(pro->directoryName()));
         if (!visitor.accept(pro)) {
             if (topLevel)
                 *fail = true;