AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let qdoc respect excludedirs for examples.

Browse Source 
Change-Id: I01063b38122aea3615801ff013c8c4a1589327fc
Reviewed-by: Martin Smith <martin.smith@nokia.com>
This commit is contained in:
Frederik Gladhorn 2012-08-29 09:04:54 +02:00 committed by Qt by Nokia
parent b856c2f8b4
commit 3d13156025
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/qdoc/config.cpp
View File

@ -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";

2
src/tools/qdoc/config.h
View File

@ -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(),

2
src/tools/qdoc/main.cpp
View File

@ -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]);