From c69d521b6702f7b51d0595512b7f6a79f4062e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 17 May 2021 15:04:26 +0200 Subject: qtattributionsscanner: Fix inclusion of CopyrightFile content Amends 4d3c39155 Pick-to: 6.1 Change-Id: I2c518bddcc7eb8ae525551c0712604fced700f16 Reviewed-by: Paul Wicking --- src/qtattributionsscanner/qdocgenerator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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()); } } -- cgit v1.2.1