AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Removed "../" from paths to images

Browse Source 
qdoc was mistakenly assuming that the output
was going into subdirectories. The base dir
variable was not being tested.

Task nr: QTBUG-26638

Change-Id: I9b331926f8954b58102f75fad3f233eaebb2bb4d
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
This commit is contained in:
Martin Smith 2012-08-06 12:42:58 +02:00 committed by Qt by Nokia
parent 6f580d6a5a
commit 7a64f2790e
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/qdoc/ditaxmlgenerator.cpp
View File

@ -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('/')));
}
}
}
}

14
src/tools/qdoc/htmlgenerator.cpp
View File

@ -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('/')));
}
}
}
}