From 3d13156025adf7bd8b343f8aa415a3b5eae07bfc Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Date: Wed, 29 Aug 2012 09:04:54 +0200
Subject: Let qdoc respect excludedirs for examples.

Change-Id: I01063b38122aea3615801ff013c8c4a1589327fc
Reviewed-by: Martin Smith <martin.smith@nokia.com>
---
 src/tools/qdoc/config.cpp | 5 ++---
 src/tools/qdoc/config.h   | 2 +-
 src/tools/qdoc/main.cpp   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp
index 7daf84dc4e..38596e1bcd 100644
--- a/src/tools/qdoc/config.cpp
+++ b/src/tools/qdoc/config.cpp
@@ -503,11 +503,10 @@ QStringList Config::getAllFiles(const QString &filesVar,
     return result;
 }
 
-QStringList Config::getExampleQdocFiles()
+QStringList Config::getExampleQdocFiles(const QSet<QString> &excludedDirs,
+                                        const QSet<QString> &excludedFiles)
 {
     QStringList result;
-    QSet<QString> excludedDirs;
-    QSet<QString> excludedFiles;
     QStringList dirs = getStringList("exampledirs");
     QString nameFilter = " *.qdoc";
 
diff --git a/src/tools/qdoc/config.h b/src/tools/qdoc/config.h
index 757235d6c2..4eb851282e 100644
--- a/src/tools/qdoc/config.h
+++ b/src/tools/qdoc/config.h
@@ -86,7 +86,7 @@ public:
                             const QString& dirsVar,
                             const QSet<QString> &excludedDirs = QSet<QString>(),
                             const QSet<QString> &excludedFiles = QSet<QString>());
-    QStringList getExampleQdocFiles();
+    QStringList getExampleQdocFiles(const QSet<QString> &excludedDirs, const QSet<QString> &excludedFiles);
     static QStringList getFilesHere(const QString& dir,
                                     const QString& nameFilter,
                                     const Location &location = Location(),
diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp
index 8eea4bd081..5bec015ee1 100644
--- a/src/tools/qdoc/main.cpp
+++ b/src/tools/qdoc/main.cpp
@@ -367,7 +367,7 @@ static void processQdocconfFile(const QString &fileName)
       Find all the qdoc files in the example dirs, and add
       them to the source files to be parsed.
      */
-    QStringList exampleQdocList = config.getExampleQdocFiles();
+    QStringList exampleQdocList = config.getExampleQdocFiles(excludedDirs, excludedFiles);
     for (int i=0; i<exampleQdocList.size(); ++i) {
         if (!sources.contains(exampleQdocList[i])) {
             sources.insert(exampleQdocList[i],exampleQdocList[i]);
-- 
cgit v1.2.3