diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-14 13:54:35 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-14 14:31:38 +0000 |
| commit | ef5dc9d466438c22a2b0a66f25e18e2c9e55d37c (patch) | |
| tree | 6fa73bf907faebdb900b953d0288fe292bb85336 /src/qdoc/generator.cpp | |
| parent | 236233f37f9ecf3a6cb829a831e5605568523c30 (diff) | |
| download | qttools-ef5dc9d466438c22a2b0a66f25e18e2c9e55d37c.tar.gz | |
qdoc/Config::findFile() Make userFriendlyFilePath an optional out parameterv5.11.0-alpha1
Task-number: PYSIDE-363
Change-Id: If076c9a77a5a11c05035f6fc30e6d68e60a35045
Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/qdoc/generator.cpp')
| -rw-r--r-- | src/qdoc/generator.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index 22ac363bd..d822c8e64 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -1065,8 +1065,7 @@ void Generator::generateFileList(const DocumentNode* dn, QStringList(), exampleDirs, file, - exampleImgExts, - userFriendlyFilePath); + exampleImgExts); outFileNames_ << prefix.mid(1) + userFriendlyFilePath; userFriendlyFilePath.truncate(userFriendlyFilePath.lastIndexOf('/')); QString imgOutDir = outDir_ + prefix + userFriendlyFilePath; @@ -1786,7 +1785,7 @@ QString Generator::imageFileName(const Node *relative, const QString& fileBase) imageDirs, fileBase, imgFileExts[format()], - userFriendlyFilePath); + &userFriendlyFilePath); if (filePath.isEmpty()) return QString(); |