diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2012-09-25 14:35:12 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 07:32:55 +0200 |
commit | a1521579983860f4f7b02d6eddc478448715ac0b (patch) | |
tree | 7e32adda9392b5511f8f3dca9ddd662944b72d1a /src/tools/qdoc/htmlgenerator.cpp | |
parent | e47faabe238d856ff6c1454a7fc9483461206b37 (diff) |
QDoc: remove the experimental basedir variable
It was introduced in the early days of the docs'
modularization and appears not to be used anywhere
anymore.
Change-Id: I5b0c60d92828624af2129153fce96ad01aec861c
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
-rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 8fe941bda7..cb4bebb67a 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -222,19 +222,6 @@ void HtmlGenerator::initializeGenerator(const Config &config) manifestDir = "qthelp://" + config.getString(prefix + "namespace"); manifestDir += QLatin1Char('/') + config.getString(prefix + "virtualFolder") + QLatin1Char('/'); - /* - If the output files will be in subdirectores in the output - directory, change the references to files in the style and - scripts subdirectories that appear in the headerscipts and - headerstyles string so that they link to the correct files, - whic means prepending "../" to each - */ - if (!baseDir().isEmpty()) { - headerScripts = headerScripts.replace("style/","../style/"); - headerScripts = headerScripts.replace("scripts/","../scripts/"); - headerStyles = headerStyles.replace("style/","../style/"); - headerStyles = headerStyles.replace("scripts/","../scripts/"); - } } /*! @@ -746,8 +733,6 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark } else { QString prefix; - if (!baseDir().isEmpty()) - prefix = "../"; out() << "<img src=\"" << protectEnc(prefix + fileName) << '"'; if (!text.isEmpty()) out() << " alt=\"" << protectEnc(text) << '"'; @@ -3624,22 +3609,6 @@ QString HtmlGenerator::getLink(const Atom *atom, const Node *relative, const Nod if (targetAtom) link += QLatin1Char('#') + refForAtom(targetAtom, *node); } - /* - If the output is going to subdirectories, then if the - two nodes will be output to different directories, then - the link must go up to the parent directory and then - back down into the other subdirectory. - */ - if (!baseDir().isEmpty()) { - if (link.startsWith("images/")) { - link.prepend(QString("../")); - } - else if (*node && relative && (*node != relative)) { - if ((*node)->outputSubdirectory() != relative->outputSubdirectory()) { - link.prepend(QString("../" + (*node)->outputSubdirectory() + QLatin1Char('/'))); - } - } - } } return link; } |