summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2015-06-12 13:53:39 +0200
committerTopi Reiniƶ <topi.reinio@digia.com>2015-07-31 07:28:25 +0000
commit8f3e7e3b47a25eccddba35f512b00097fd5f6930 (patch)
tree82a7e08122d4168d5ed04d74acbc8dbdfd3cf3cb /src
parent0d3c8feeeb3c49d01bcfbca63b672e20ab29aa9f (diff)
qdoc: Add images used in examples into .qhp
Images used as resources in examples were missing from the generated .qch files. Change-Id: I7cdfc65b646a418e3de0b22d9a075e9a413aca29 Task-number: QTBUG-46635 Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/tools/qdoc/generator.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp
index d22ec507f6..7f0d4b48b9 100644
--- a/src/tools/qdoc/generator.cpp
+++ b/src/tools/qdoc/generator.cpp
@@ -938,15 +938,17 @@ void Generator::generateFileList(const DocumentNode* dn,
if (!file.isEmpty()) {
QDir dirInfo;
QString userFriendlyFilePath;
+ const QString prefix("/images/used-in-examples/");
QString srcPath = Config::findFile(dn->location(),
QStringList(),
exampleDirs,
file,
exampleImgExts,
userFriendlyFilePath);
+ outFileNames_ << prefix.mid(1) + userFriendlyFilePath;
userFriendlyFilePath.truncate(userFriendlyFilePath.lastIndexOf('/'));
- QString imgOutDir = outDir_ + "/images/used-in-examples/" + userFriendlyFilePath;
+ QString imgOutDir = outDir_ + prefix + userFriendlyFilePath;
if (!dirInfo.mkpath(imgOutDir))
dn->location().fatal(tr("Cannot create output directory '%1'")
.arg(imgOutDir));