diff options
| author | Martin Smith <martin.smith@digia.com> | 2012-11-20 13:19:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 11:03:48 +0100 |
| commit | 23ea027841ae716cf057e3682604a7598cb63696 (patch) | |
| tree | a022fff54557dbd5635d7989229f369ca24ee5ad /src | |
| parent | 2862697e901a06b4c5622987aa6ef7459de47d3c (diff) | |
qdoc: Make image paths relative to html file
Task-number: QTBUG-28080
Change-Id: Ie552cacdf736f9f6da3148a11ef2362248775e1a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/qdoc/generator.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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) |