summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/ditaxmlgenerator.cpp
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2012-09-25 14:35:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-28 07:32:55 +0200
commita1521579983860f4f7b02d6eddc478448715ac0b (patch)
tree7e32adda9392b5511f8f3dca9ddd662944b72d1a /src/tools/qdoc/ditaxmlgenerator.cpp
parente47faabe238d856ff6c1454a7fc9483461206b37 (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/ditaxmlgenerator.cpp')
-rw-r--r--src/tools/qdoc/ditaxmlgenerator.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp
index bfd834845a..5211b276eb 100644
--- a/src/tools/qdoc/ditaxmlgenerator.cpp
+++ b/src/tools/qdoc/ditaxmlgenerator.cpp
@@ -1274,8 +1274,6 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
if (fileName.isEmpty()) {
relative->location().warning(tr("Missing image: %1").arg(protectEnc(atom->string())));
QString images = "images";
- if (!baseDir().isEmpty())
- images.prepend("../");
if (!atom->string().isEmpty() && atom->string()[0] != '/')
images.append(QLatin1Char('/'));
fileName = images + atom->string();
@@ -3925,22 +3923,6 @@ QString DitaXmlGenerator::getLink(const Atom* atom, const Node* relative, const
link += QLatin1Char('#') + (*node)->guid();
}
}
- /*
- 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('/')));
- }
- }
- }
}
if (!link.isEmpty() && link[0] == '#') {
link.prepend(outFileName());