diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-11-16 15:23:36 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-11-16 15:23:36 (GMT) |
| commit | ff8486f8326e214faa08eacc8e91b5333d68e912 (patch) | |
| tree | 2fd560a86cdd7e043c3cc6d317b9c232c670a7ed /tools | |
| parent | 44b08536caa51700e6885bff90c2c3f9de699ad6 (diff) | |
| parent | 23f3c60c42ffc42acee823ba8041b9474cc15133 (diff) | |
| download | Qt-ff8486f8326e214faa08eacc8e91b5333d68e912.zip Qt-ff8486f8326e214faa08eacc8e91b5333d68e912.tar.gz Qt-ff8486f8326e214faa08eacc8e91b5333d68e912.tar.bz2 | |
Merge remote-tracking branch 'mainline/4.8'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 8 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.h | 1 | ||||
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 85ce9ac..923d523 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -217,6 +217,10 @@ void HtmlGenerator::initializeGenerator(const Config &config) headerStyles = config.getString(HtmlGenerator::format() + Config::dot + CONFIG_HEADERSTYLES); + + QString prefix = CONFIG_QHP + Config::dot + "Qt" + Config::dot; + manifestDir = "qthelp://" + config.getString(prefix + "namespace"); + manifestDir += "/" + config.getString(prefix + "virtualFolder") + "/"; } void HtmlGenerator::terminateGenerator() @@ -4398,7 +4402,7 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element) writer.writeStartElement(element); writer.writeAttribute("name", en->title()); //QString docUrl = projectUrl + "/" + en->fileBase() + ".html"; - QString docUrl = "%REPLACEME%/" + en->fileBase() + ".html"; + QString docUrl = manifestDir + en->fileBase() + ".html"; writer.writeAttribute("docUrl", docUrl); foreach (const Node* child, en->childNodes()) { if (child->subType() == Node::File) { @@ -4412,7 +4416,7 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element) } } //writer.writeAttribute("imageUrl", projectUrl + "/" + en->imageFileName()); - writer.writeAttribute("imageUrl", "%REPLACEME%/" + en->imageFileName()); + writer.writeAttribute("imageUrl", manifestDir + en->imageFileName()); writer.writeStartElement("description"); Text brief = en->doc().briefText(); if (!brief.isEmpty()) diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index 62a7f605..baf7c30 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -274,6 +274,7 @@ class HtmlGenerator : public PageGenerator QString projectDescription; QString projectUrl; QString navigationLinks; + QString manifestDir; QStringList stylesheets; QStringList customHeadElements; const Tree *myTree; diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index bb5ff83..254ba92 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -15,6 +15,11 @@ qdoc_bootstrapped { CONFIG -= debug_and_release_target } +# Increase the stack size on MSVC to 4M to avoid a stack overflow +win32-msvc*:{ + QMAKE_LFLAGS += /STACK:\"4194304\" +} + !isEmpty(QT_BUILD_TREE):DESTDIR = $$QT_BUILD_TREE/bin #CONFIG += debug build_all:!build_pass { |