From 23ea027841ae716cf057e3682604a7598cb63696 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Tue, 20 Nov 2012 13:19:12 +0100
Subject: qdoc: Make image paths relative to html file

Task-number: QTBUG-28080

Change-Id: Ie552cacdf736f9f6da3148a11ef2362248775e1a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
 src/tools/qdoc/generator.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp
index 2854aedbbe..7b0a3163d2 100644
--- a/src/tools/qdoc/generator.cpp
+++ b/src/tools/qdoc/generator.cpp
@@ -1443,10 +1443,11 @@ QString Generator::imageFileName(const Node *relative, const QString& fileBase)
                                     filePath,
                                     userFriendlyFilePath,
                                     outputDir() + QLatin1String("/images"));
-    QString images = "images";
-    if (path[0] != '/')
-        images.append(QLatin1Char('/'));
-    return images + path;
+    int images_slash = path.lastIndexOf("images/");
+    QString relImagePath;
+    if (images_slash != -1)
+        relImagePath = path.mid(images_slash);
+    return relImagePath;
 }
 
 QString Generator::indent(int level, const QString& markedCode)
-- 
cgit v1.2.3