diff options
Diffstat (limited to 'src/tools/qdoc/ditaxmlgenerator.cpp')
-rw-r--r-- | src/tools/qdoc/ditaxmlgenerator.cpp | 18 |
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()); |