From fe099b63837d0ea93db0abf8894139271a01ee05 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 24 Jun 2014 12:05:35 +0200 Subject: [PATCH] qdoc: Validate index file paths Check for existence of the paths added by 'indexes' documentation configuration command, and generate warnings accordingly. Also, ensure that the strings added with 'depends' command contain no duplicates. Change-Id: I66a3d1b25907567bb5bfc72b78a8009d7bd8e067 Reviewed-by: Martin Smith Reviewed-by: Jerome Pasion --- src/tools/qdoc/main.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index d0c3a0295a..758918e2b6 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -95,9 +95,18 @@ static void loadIndexFiles(Config& config) /* Read some XML indexes containing definitions from other documentation sets. */ - QStringList indexFiles = config.getStringList(CONFIG_INDEXES); + QStringList indexFiles; + QStringList configIndexes = config.getStringList(CONFIG_INDEXES); + foreach (const QString &index, configIndexes) { + QFileInfo fi(index); + if (fi.exists() && fi.isFile()) + indexFiles << index; + else if (Generator::runGenerateOnly()) + qDebug() << "warning: Index file not found:" << index; + } dependModules += config.getStringList(CONFIG_DEPENDS); + dependModules.removeDuplicates(); bool noOutputSubdirs = false; QString singleOutputSubdir;