summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2018-08-28 13:17:05 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2018-08-28 14:17:46 +0000
commit39b59e8b4bd9083070175f1ea4067e68f507a394 (patch)
treede9f5b5dc93e630ff3eaaf4dfb1db02753bf8847
parent58af85972b45d905400ba1930b630e77601a2fb0 (diff)
downloadqttools-39b59e8b4bd9083070175f1ea4067e68f507a394.tar.gz
qdoc: Restore the correct output directory for example images
Commit ef5dc9d4 introduced a regression where the images used in examples are not copied to the correct output directory. Task-number: QTBUG-70218 Change-Id: I2a1b8a48e9b956e0f6dcc3318abc8b6400eb19e0 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/qdoc/generator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index b877ddeb0..7172ee505 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -1048,7 +1048,8 @@ void Generator::generateFileList(const DocumentNode* dn,
QStringList(),
exampleDirs,
file,
- exampleImgExts);
+ exampleImgExts,
+ &userFriendlyFilePath);
outFileNames_ << prefix.mid(1) + userFriendlyFilePath;
userFriendlyFilePath.truncate(userFriendlyFilePath.lastIndexOf('/'));
QString imgOutDir = outDir_ + prefix + userFriendlyFilePath;