From c4f09711829789ea1dff8925fb54e12873cc3bb1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 26 Aug 2013 15:36:34 +0200 Subject: [PATCH] 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 Reviewed-by: Oswald Buddenhagen --- src/linguist/lupdate/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; -- 2.7.4