From 00a04dddaf144106f9c1c278e18094e6ccc42fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucie=20G=C3=A9rard?= Date: Tue, 7 May 2024 16:25:48 +0200 Subject: [PATCH] Add REUSE ignore comment For those files, reuse fails to process the copyright and licensing information. The information is written to .reuse/dep5 file and reuse is told to ignore what is in the file. Task-number: QTBUG-124453 Change-Id: If593c713026d9d349055cb6e8e73500966a05d9b Reviewed-by: Joerg Bornemann --- src/tools/qlalr/cppgenerator.cpp | 5 ++++- tests/auto/tools/moc/os9-newlines.h | 2 +- util/aglfn/main.cpp | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/tools/qlalr/cppgenerator.cpp b/src/tools/qlalr/cppgenerator.cpp index fd56de106d3..f12917f0eb8 100644 --- a/src/tools/qlalr/cppgenerator.cpp +++ b/src/tools/qlalr/cppgenerator.cpp @@ -1,5 +1,7 @@ +// REUSE-IgnoreStart // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// REUSE-IgnoreEnd #include "cppgenerator.h" @@ -39,7 +41,7 @@ void generateList(const QList &list, QTextStream &out) } } - +// REUSE-IgnoreStart QString CppGenerator::copyrightHeader() const { return @@ -47,6 +49,7 @@ QString CppGenerator::copyrightHeader() const "// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0\n" "\n"_L1; } +// REUSE-IgnoreEnd QString CppGenerator::privateCopyrightHeader() const { diff --git a/tests/auto/tools/moc/os9-newlines.h b/tests/auto/tools/moc/os9-newlines.h index 82bddd117df..2da70f6a89a 100644 --- a/tests/auto/tools/moc/os9-newlines.h +++ b/tests/auto/tools/moc/os9-newlines.h @@ -1 +1 @@ -// Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include class Os9Newlines : public QObject { Q_OBJECT public Q_SLOTS: inline void testSlot() {} }; \ No newline at end of file +// REUSE-IgnoreStart // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // REUSE-IgnoreEnd #include class Os9Newlines : public QObject { Q_OBJECT public Q_SLOTS: inline void testSlot() {} }; \ No newline at end of file diff --git a/util/aglfn/main.cpp b/util/aglfn/main.cpp index afcf8c2b2c8..6c8dd788280 100644 --- a/util/aglfn/main.cpp +++ b/util/aglfn/main.cpp @@ -1,5 +1,7 @@ +// REUSE-IgnoreStart // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// REUSE-IgnoreEnd #include #include @@ -120,11 +122,12 @@ static QByteArray createGlyphList() int main(int, char **) { readGlyphList(); - +// REUSE-IgnoreStart QByteArray header = "// Copyright (C) 2016 The Qt Company Ltd.\n" "// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only\n" "\n"; +// REUSE-IgnoreEnd QByteArray note = "/* This file is autogenerated from the Adobe Glyph List database" +