From b21c82908c640068bed9bdcd80281d0e6f7adede Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Thu, 10 Oct 2013 12:33:28 +0200
Subject: qdoc: Snippets files no longer parsed by qdoc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The files in the doc/snippets subdirectory of each example
subdirectory are no longer parsed by qdoc as source files.
They continue to be used as snippets files.

This fix also ensures that there are no duplicates in the
list of files to be parsed.

Task-number: QTBUG-34003
Change-Id: Icec1a2a539237f24ee6bae89c6401f0dc81826d1
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
 src/tools/qdoc/main.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp
index 246e4d2d82..4573724137 100644
--- a/src/tools/qdoc/main.cpp
+++ b/src/tools/qdoc/main.cpp
@@ -393,6 +393,10 @@ static void processQdocconfFile(const QString &fileName)
     QMap<QString,QString> headers;
     QMultiMap<QString,QString> headerFileNames;
     for (int i=0; i<headerList.size(); ++i) {
+        if (headerList[i].contains(QString("doc/snippets")))
+            continue;
+        if (headers.contains(headerList[i]))
+            continue;
         headers.insert(headerList[i],headerList[i]);
         QString t = headerList[i].mid(headerList[i].lastIndexOf('/')+1);
         headerFileNames.insert(t,t);
@@ -403,6 +407,10 @@ static void processQdocconfFile(const QString &fileName)
     QMap<QString,QString> sources;
     QMultiMap<QString,QString> sourceFileNames;
     for (int i=0; i<sourceList.size(); ++i) {
+        if (sourceList[i].contains(QString("doc/snippets")))
+            continue;
+        if (sources.contains(sourceList[i]))
+            continue;
         sources.insert(sourceList[i],sourceList[i]);
         QString t = sourceList[i].mid(sourceList[i].lastIndexOf('/')+1);
         sourceFileNames.insert(t,t);
-- 
cgit v1.2.3