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/cppcodeparser.cpp | |
| parent | 236233f37f9ecf3a6cb829a831e5605568523c30 (diff) | |
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/cppcodeparser.cpp')
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index 14e4fa7ba..9ac687557 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -1346,31 +1346,24 @@ void CppCodeParser::createExampleFileNodes(DocumentNode *dn) { QString examplePath = dn->name(); QString proFileName = examplePath + QLatin1Char('/') + examplePath.split(QLatin1Char('/')).last() + ".pro"; - QString userFriendlyFilePath; - QString fullPath = Config::findFile(dn->doc().location(), exampleFiles, exampleDirs, - proFileName, - userFriendlyFilePath); + proFileName); if (fullPath.isEmpty()) { QString tmp = proFileName; proFileName = examplePath + QLatin1Char('/') + "qbuild.pro"; - userFriendlyFilePath.clear(); fullPath = Config::findFile(dn->doc().location(), exampleFiles, exampleDirs, - proFileName, - userFriendlyFilePath); + proFileName); if (fullPath.isEmpty()) { proFileName = examplePath + QLatin1Char('/') + examplePath.split(QLatin1Char('/')).last() + ".qmlproject"; - userFriendlyFilePath.clear(); fullPath = Config::findFile(dn->doc().location(), exampleFiles, exampleDirs, - proFileName, - userFriendlyFilePath); + proFileName); if (fullPath.isEmpty()) { QString details = QLatin1String("Example directories: ") + exampleDirs.join(QLatin1Char(' ')); if (!exampleFiles.isEmpty()) |