Let qdoc respect excludedirs for examples.

Change-Id: I01063b38122aea3615801ff013c8c4a1589327fc
Reviewed-by: Martin Smith <martin.smith@nokia.com>

diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp
index 7daf84d..38596e1 100644 (file)
--- 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 757235d..4eb8512 100644 (file)
--- 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 8eea4bd..5bec015 100644 (file)
--- 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]);