diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-06-14 10:43:28 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-12 13:57:46 +0000 |
| commit | 741e079ccf06fd88bb8e3cb36855aac6453c54eb (patch) | |
| tree | 62fe74b366e136a1e8aac5550e8229ec9789c91b | |
| parent | b0bb1bf334d69368e176a9ae2b6e953cb2618a0f (diff) | |
qdoc: Fix compile error about mixing different types in operator ?
Simplify code, fixing:
qdoc/generator.cpp: In member function QString Generator::fileName(const Node*, const QString&) const:
src/qdoc/qdoc/generator.cpp:361:31: error: operands to ?: have different types
QStringBuilder<QString&, QString> and
QStringBuilder<QString&, const QString&>
Change-Id: Ia986cb0b7c8811cc1adf186f1a2b5beb15667dc8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit d221c18b5d797d0b665a44738748aca1fec62c86)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qdoc/qdoc/generator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/qdoc/generator.cpp b/src/qdoc/qdoc/generator.cpp index 63b3b5368..a3d20a9bb 100644 --- a/src/qdoc/qdoc/generator.cpp +++ b/src/qdoc/qdoc/generator.cpp @@ -358,7 +358,7 @@ QString Generator::fileName(const Node *node, const QString &extension) const return node->url(); QString name = fileBase(node) + QLatin1Char('.'); - return extension.isNull() ? name + fileExtension() : name + extension; + return name + (extension.isNull() ? fileExtension() : extension); } /*! |