From 39b59e8b4bd9083070175f1ea4067e68f507a394 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 28 Aug 2018 13:17:05 +0200 Subject: 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 Reviewed-by: Friedemann Kleint --- src/qdoc/generator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- cgit v1.2.1