summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/generator.h
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2012-07-24 14:27:37 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-25 01:00:41 +0200
commita4cd6ef25df6a2a99626a0e97bfc239f68e7771f (patch)
treea95e458fe9f64b76ddcbabc0ec46554c017f6dba /src/tools/qdoc/generator.h
parent48d439833ac25c033a5c999a8f2dbf94561b5bca (diff)
qdoc: Fixed incorrect href attribute values in qdoc
There were two fileBase() functions, but only one was correct. The wrong one was being called in some cases. Now there is only one fileBase() function, which is always called. Task nr: QTBUG-26591 Change-Id: I2c40e2152a8c7ad1bb9db256ecf1367148f0e7f6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/generator.h')
-rw-r--r--src/tools/qdoc/generator.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/qdoc/generator.h b/src/tools/qdoc/generator.h
index 74cca3ff5b..e73627002c 100644
--- a/src/tools/qdoc/generator.h
+++ b/src/tools/qdoc/generator.h
@@ -89,9 +89,10 @@ public:
virtual void initializeGenerator(const Config &config);
virtual void terminateGenerator();
+ QString fullDocumentLocation(const Node *node, bool subdir = false);
+
static const QString& baseDir() { return baseDir_; }
static Generator *currentGenerator() { return currentGenerator_; }
- static QString fullDocumentLocation(const Node *node, bool subdir = false);
static Generator *generatorForFormat(const QString& format);
static void initialize(const Config& config);
static const QString& outputDir() { return outDir_; }