summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2013-10-10 12:25:01 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-01 14:52:47 +0100
commit9205ae8fa49ad8ce330c522048f601bcab4e2174 (patch)
tree76e1cda96cc77a3bf276bae8e48fb5b2a74164a1
parentb6a4545b8f8714961025dd4475e966a5f505e9eb (diff)
qdoc:headers and sources paths are canonicalized
This eliminates the possibility that the same file could appear in the file list twice causing qdoc to parse it twice. Task-number: QTBUG-34002 Change-Id: Iab63d778c9f955076515a8ae2f1bd9560099b13d Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--src/tools/qdoc/config.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp
index cb9b8c3269..2d8e98d64c 100644
--- a/src/tools/qdoc/config.cpp
+++ b/src/tools/qdoc/config.cpp
@@ -703,7 +703,7 @@ QStringList Config::getAllFiles(const QString &filesVar,
const QSet<QString> &excludedDirs,
const QSet<QString> &excludedFiles)
{
- QStringList result = getStringList(filesVar);
+ QStringList result = getCanonicalPathList(filesVar);
QStringList dirs = getCanonicalPathList(dirsVar);
QString nameFilter = getString(filesVar + dot + CONFIG_FILEEXTENSIONS);