diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-05-17 15:04:26 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-01 13:05:28 +0000 |
| commit | d00ad6c89b9f7f86686f9e4f6c48799a65d5a0ee (patch) | |
| tree | 12f48b491847e2617eae77e64f23cd5bb6ca70ba | |
| parent | fd9bb2569128150e5dfe8bfd4b22dd5d507562f8 (diff) | |
qtattributionsscanner: Fix inclusion of CopyrightFile content
Amends 4d3c39155
Change-Id: I2c518bddcc7eb8ae525551c0712604fced700f16
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit c69d521b6702f7b51d0595512b7f6a79f4062e05)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qtattributionsscanner/qdocgenerator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qtattributionsscanner/qdocgenerator.cpp b/src/qtattributionsscanner/qdocgenerator.cpp index 701aa8530..1b02ac367 100644 --- a/src/qtattributionsscanner/qdocgenerator.cpp +++ b/src/qtattributionsscanner/qdocgenerator.cpp @@ -140,8 +140,9 @@ static void generate(QTextStream &out, const Package &package, const QDir &baseD tr("Path %1 : cannot open copyright file %2.\n") .arg(QDir::toNativeSeparators(package.path)) .arg(QDir::toNativeSeparators(package.copyrightFile))); - copyright = QString::fromUtf8(file.readAll()); } + } else { + copyright = QString::fromUtf8(file.readAll()); } } |