summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-28 08:21:07 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-28 08:21:07 (GMT)
commit280be5f09da8ec09b4372f5a20bd87d092d36d38 (patch)
tree1693cdae89934336b779f3f016814e1356580959
parent12a175030d5cf93104d73c559afa71f02dce3d03 (diff)
parent3b05c91ab8876ab64855900bb5a8cf38f91b69f3 (diff)
downloadQt-280be5f09da8ec09b4372f5a20bd87d092d36d38.zip
Qt-280be5f09da8ec09b4372f5a20bd87d092d36d38.tar.gz
Qt-280be5f09da8ec09b4372f5a20bd87d092d36d38.tar.bz2
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Added a way to exclude directories from receiving default metadata
-rw-r--r--tools/qdoc3/main.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 7eb8067..52715a3 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -235,6 +235,26 @@ static void processQdocconfFile(const QString &fileName)
QStringList indexFiles = config.getStringList(CONFIG_INDEXES);
tree->readIndexes(indexFiles);
+#if 0
+ /*
+ I think we won't beusing this...
+
+ Read the list of DITA excluded directories.
+ */
+ QSet<QString> ditaExcludedDirs;
+ QStringList ditaExcludedDirsList = config.getStringList("dita.metadata.excludedirs");
+ foreach (const QString &t, ditaExcludedDirsList)
+ ditaExcludedDirs.insert(QDir::fromNativeSeparators(t));
+
+ if (!ditaExcludedDirs.isEmpty()) {
+ QSet<QString>::iterator i = ditaExcludedDirs.begin();
+ while (i != ditaExcludedDirs.end()) {
+ qDebug() << "DITA EXCLUDED DIR:" << (*i);
+ ++i;
+ }
+ }
+#endif
+
/*
Read the list of excluded directories.
*/