diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-05-17 15:04:26 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2021-06-01 10:56:18 +0000 |
| commit | c69d521b6702f7b51d0595512b7f6a79f4062e05 (patch) | |
| tree | b37243aaef007fa414b832381c57f77b2e71b5f2 /src/qtattributionsscanner | |
| parent | b06d01d17cb3df37032ce5402ef4c6d0cfa80fd5 (diff) | |
| download | qttools-c69d521b6702f7b51d0595512b7f6a79f4062e05.tar.gz | |
qtattributionsscanner: Fix inclusion of CopyrightFile content
Amends 4d3c39155
Pick-to: 6.1
Change-Id: I2c518bddcc7eb8ae525551c0712604fced700f16
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qtattributionsscanner')
| -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()); } } |