Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

2 files changed, 11 insertions, 5 deletions

diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index b801e1e..c49ff65 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -1199,7 +1199,10 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                   Just output the href as if the image is in
                   the images directory...
                  */
-                fileName = QLatin1String("images/") + protectEnc(atom->string());
+                if (atom->string()[0] == '/')
+                    fileName = QLatin1String("images") + atom->string();
+                else
+                    fileName = QLatin1String("images/") + atom->string();
             }
 
             if (currentTag() != DT_xref)
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 3367301..6c92e54 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -783,10 +783,13 @@ QString Generator::imageFileName(const Node *relative, const QString& fileBase)
     if (filePath.isEmpty())
         return QString();
 
-    return QLatin1String("images/")
-           + Config::copyFile(relative->doc().location(),
-                              filePath, userFriendlyFilePath,
-                              outputDir() + QLatin1String("/images"));
+    QString path = Config::copyFile(relative->doc().location(),
+                                    filePath,
+                                    userFriendlyFilePath,
+                                    outputDir() + QLatin1String("/images"));
+    if (path[0] != '/')
+        return QLatin1String("images/") + path;
+    return QLatin1String("images") + path;
 }
 
 void Generator::setImageFileExtensions(const QStringList& extensions)