diff options
Diffstat (limited to 'src/tools/qdoc')
| -rw-r--r-- | src/tools/qdoc/ditaxmlgenerator.cpp | 14 | ||||
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index f9506ff348..0d99177763 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -4222,12 +4222,14 @@ QString DitaXmlGenerator::getLink(const Atom* atom, the link must go up to the parent directory and then back down into the other subdirectory. */ - 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 (!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('/'))); + } } } } diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 46e5d0a4b5..5e412f446a 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -3823,12 +3823,14 @@ QString HtmlGenerator::getLink(const Atom *atom, the link must go up to the parent directory and then back down into the other subdirectory. */ - 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 (!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('/'))); + } } } } |