From 8f3e7e3b47a25eccddba35f512b00097fd5f6930 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 12 Jun 2015 13:53:39 +0200 Subject: 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 --- src/tools/qdoc/generator.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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)); -- cgit v1.2.3