summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/htmlgenerator.h
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2013-12-02 10:46:21 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-03 14:12:20 +0100
commit1fc28716e67cb9a4384c99c39e8a283ca344e771 (patch)
treed21913bfbf52b24ad945b8b34fa39f8d285e82df /src/tools/qdoc/htmlgenerator.h
parent119ea0f2dbaa4cdea6929e542c59f99b2dfd0ef9 (diff)
qdoc: Replaced hard-coded href with computed href
For enum types that have QFlags versions, qdoc was outputting the documentation with a hard-coded link to qflags.html, which only workjed in the single directory mode. When qdoc outputs modular documentation, the href for the link should be "../qtcore/qflags.html" . Now qdoc computes this href correctly before it writes the docs. The href is no longer hard-coded. Task-number: QTBUG-35209 Change-Id: Ibdf5b11dbd063726eb77048de78f8874c65752ca Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.h')
-rw-r--r--src/tools/qdoc/htmlgenerator.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/qdoc/htmlgenerator.h b/src/tools/qdoc/htmlgenerator.h
index f2525327e8..ae16f3c54f 100644
--- a/src/tools/qdoc/htmlgenerator.h
+++ b/src/tools/qdoc/htmlgenerator.h
@@ -262,6 +262,7 @@ private:
QString cppclassespage;
QString qmltypespage;
QString buildversion;
+ QString qflagsHref_;
public:
static bool debugging_on;