Commit 3460395e authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by The Qt Project
Browse files

support indirect SUBDIRS


that is, .file and .subdir "structs".

Change-Id: I6c7ea5971642802a97461d821cb1544fcc986013
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent ce8aa44e
Branches
Tags
No related merge requests found
Showing with 8 additions and 2 deletions
...@@ -361,7 +361,12 @@ static void processProject( ...@@ -361,7 +361,12 @@ static void processProject(
QStringList subProFiles; QStringList subProFiles;
QDir proDir(proPath); QDir proDir(proPath);
foreach (const QString &subdir, visitor.values(QLatin1String("SUBDIRS"))) { 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); QFileInfo subInfo(subPro);
if (subInfo.isDir()) if (subInfo.isDir())
subProFiles << (subPro + QLatin1Char('/') subProFiles << (subPro + QLatin1Char('/')
......
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = win mac unix common comm.subdir = common
SUBDIRS = win mac unix comm
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment