diff options
| author | Martin Smith <martin.smith@digia.com> | 2013-09-20 13:39:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-23 12:36:55 +0200 |
| commit | f5b3224cb5321b8b3ffefff13f547fbe81ea0c7c (patch) | |
| tree | 3bf269e09c2819a90f8e0fb7b3297153a1d7ae7d /src/tools/qdoc/htmlgenerator.cpp | |
| parent | 2d00d3951d9384c848794ac9dd783986165eef8f (diff) | |
qdoc: \externalpage links are fixed
The problem was they were being incorrectly written to
and read from the index files.
Task-number: QTBUG-33510
Change-Id: Ib0b34265cd22fff5ed88ae2fd5d5d7ea58b3761d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 1c28ede976..ac10bb94e3 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -3605,8 +3605,10 @@ QString HtmlGenerator::linkForNode(const Node *node, const Node *relative) back down into the other subdirectory. */ if (node && relative && (node != relative)) { - if (useOutputSubdirs() && node->outputSubdirectory() != relative->outputSubdirectory()) + if (useOutputSubdirs() && !node->isExternalPage() && + node->outputSubdirectory() != relative->outputSubdirectory()) { link.prepend(QString("../" + node->outputSubdirectory() + QLatin1Char('/'))); + } } return link; } |