diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-08-26 15:36:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-26 23:57:32 +0200 |
| commit | c4f09711829789ea1dff8925fb54e12873cc3bb1 (patch) | |
| tree | c047acb639420bc3ec5eac4f1375490312c3144a | |
| parent | 3eb6378f78d002897a611f348abae090d9612685 (diff) | |
| download | qttools-c4f09711829789ea1dff8925fb54e12873cc3bb1.tar.gz | |
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>
| -rw-r--r-- | src/linguist/lupdate/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp index bf98c8d85..c6902c46a 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; |