From 3460395ebbf1e9eb05419854c0d5de28b89b9b0a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 6 Sep 2012 20:57:35 +0200 Subject: [PATCH] support indirect SUBDIRS that is, .file and .subdir "structs". Change-Id: I6c7ea5971642802a97461d821cb1544fcc986013 Reviewed-by: Daniel Teske --- src/linguist/lupdate/main.cpp | 7 ++++++- .../auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp index 0ef299b..1eac99b 100644 --- a/src/linguist/lupdate/main.cpp +++ b/src/linguist/lupdate/main.cpp @@ -361,7 +361,12 @@ static void processProject( QStringList subProFiles; QDir proDir(proPath); foreach (const QString &subdir, visitor.values(QLatin1String("SUBDIRS"))) { - QString subPro = QDir::cleanPath(proDir.absoluteFilePath(subdir)); + QString realdir = visitor.value(subdir + QLatin1String(".subdir")); + if (realdir.isEmpty()) + realdir = visitor.value(subdir + QLatin1String(".file")); + if (realdir.isEmpty()) + realdir = subdir; + QString subPro = QDir::cleanPath(proDir.absoluteFilePath(realdir)); QFileInfo subInfo(subPro); if (subInfo.isDir()) subProFiles << (subPro + QLatin1Char('/') diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro index f75a462..13f9217 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = win mac unix common +comm.subdir = common +SUBDIRS = win mac unix comm -- 2.7.4