summaryrefslogtreecommitdiff
path: root/src/qdoc/cppcodeparser.h
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-05-11 14:40:26 +0200
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-05-12 09:00:20 +0000
commit27bced7694a593eca555bf4cc46c084ba9302f2d (patch)
tree378b6c82e33a190d0fba9c11c69f6d1d9bd1d00b /src/qdoc/cppcodeparser.h
parent570f0f314cbe4603db34d4967b6a7dd35d174eba (diff)
downloadqttools-27bced7694a593eca555bf4cc46c084ba9302f2d.tar.gz
qdoc: Allow example files to be excluded
Documentation configuration variables 'excludedirs' and 'excludefiles' had no effect on what source and image files were listed as belonging to an example. This commit fixes that, and refactors excludedirs/files handling: Remove duplicated code blocks, amd simplify the code reading the variables: - Drop checks whether an excluded directory exists - Drop conversion of native separators for excluded paths Both are unnecessary; QDoc expects '/'-separated paths for many other variables, and if an excluded dir does not exist, it won't exclude anything. Change-Id: Ie25511e20d33888653c23bb84975368317eb4306 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
Diffstat (limited to 'src/qdoc/cppcodeparser.h')
-rw-r--r--src/qdoc/cppcodeparser.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qdoc/cppcodeparser.h b/src/qdoc/cppcodeparser.h
index d3a5829e3..3910807ab 100644
--- a/src/qdoc/cppcodeparser.h
+++ b/src/qdoc/cppcodeparser.h
@@ -179,6 +179,8 @@ protected:
static QStringList exampleFiles;
static QStringList exampleDirs;
+ static QSet<QString> excludeDirs;
+ static QSet<QString> excludeFiles;
static CppCodeParser* cppParser_;
QString exampleNameFilter;
QString exampleImageFilter;