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

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>

diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp
index f9506ff..0d99177 100644 (file)
--- 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 46e5d0a..5e412f4 100644 (file)
--- 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('/')));
+                }
             }
         }
     }