diff options
| -rw-r--r-- | src/tools/qdoc/ditaxmlgenerator.cpp | 3 | ||||
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index 563df612ab..1ffbcf986c 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -573,7 +573,8 @@ void DitaXmlGenerator::initializeGenerator(const Config &config) customHeadElements = config.getStringList(DitaXmlGenerator::format() + Config::dot + DITAXMLGENERATOR_CUSTOMHEADELEMENTS); - codeIndent = config.getInt(CONFIG_CODEINDENT); + // The following line was changed to fix QTBUG-27798 + //codeIndent = config.getInt(CONFIG_CODEINDENT); version = config.getString(CONFIG_VERSION); vrm = version.split(QLatin1Char('.')); } diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 17dc40f08a..d48c706707 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -94,7 +94,8 @@ static void addLink(const QString &linkTarget, Constructs the HTML output generator. */ HtmlGenerator::HtmlGenerator() - : helpProjectWriter(0), + : codeIndent(0), + helpProjectWriter(0), inObsoleteLink(false), funcLeftParen("\\S(\\()"), obsoleteLinks(false) @@ -210,7 +211,8 @@ void HtmlGenerator::initializeGenerator(const Config &config) ++edition; } - codeIndent = config.getInt(CONFIG_CODEINDENT); + // The following line was changed to fix QTBUG-27798 + //codeIndent = config.getInt(CONFIG_CODEINDENT); helpProjectWriter = new HelpProjectWriter(config, project.toLower() + ".qhp", this); |