From d478ca528511fcaa95491bcedaa259b2f6c5e727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucie=20G=C3=A9rard?= Date: Mon, 19 Feb 2024 12:29:13 +0100 Subject: [PATCH] Correct license in config.test According to QUIP-18 [1], all build system files should be BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I06880d91e4c6f8d7a92d249f3d216b2bc82fdeed Reviewed-by: Joerg Bornemann --- config.tests/arch/arch.cpp | 2 +- config.tests/binary_for_strip/lib1.cpp | 2 +- config.tests/precompile_header/header.h | 2 +- config.tests/precompile_header/main.cpp | 2 +- config.tests/static_link_order/main.cpp | 2 +- config.tests/static_link_order/objlib.cpp | 2 +- config.tests/static_link_order/staticlib1.cpp | 2 +- config.tests/static_link_order/staticlib2.cpp | 2 +- config.tests/x86_simd/main.cpp | 2 +- config.tests/x86intrin/main.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp index ffb6c787ff5..44ec7214320 100644 --- a/config.tests/arch/arch.cpp +++ b/config.tests/arch/arch.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2016 Intel Corporation. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: BSD-3-Clause #define QGLOBAL_H #include "../../src/corelib/global/archdetect.cpp" diff --git a/config.tests/binary_for_strip/lib1.cpp b/config.tests/binary_for_strip/lib1.cpp index bb57c4da77c..d2b78475572 100644 --- a/config.tests/binary_for_strip/lib1.cpp +++ b/config.tests/binary_for_strip/lib1.cpp @@ -1,4 +1,4 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: BSD-3-Clause int libfunc() { return 0; } diff --git a/config.tests/precompile_header/header.h b/config.tests/precompile_header/header.h index 4288ee27317..0e35f8cb85d 100644 --- a/config.tests/precompile_header/header.h +++ b/config.tests/precompile_header/header.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: BSD-3-Clause #ifndef HEADER_H #define HEADER_H diff --git a/config.tests/precompile_header/main.cpp b/config.tests/precompile_header/main.cpp index e93b02256dc..3ea84a8dae2 100644 --- a/config.tests/precompile_header/main.cpp +++ b/config.tests/precompile_header/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: BSD-3-Clause #ifndef HEADER_H # error no go #endif diff --git a/config.tests/static_link_order/main.cpp b/config.tests/static_link_order/main.cpp index 162c48ce3ff..93b8825fd92 100644 --- a/config.tests/static_link_order/main.cpp +++ b/config.tests/static_link_order/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: BSD-3-Clause void staticLibFunc1(); diff --git a/config.tests/static_link_order/objlib.cpp b/config.tests/static_link_order/objlib.cpp index 0da71f45525..0ad7b76a80e 100644 --- a/config.tests/static_link_order/objlib.cpp +++ b/config.tests/static_link_order/objlib.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: BSD-3-Clause void staticLibFunc2(); diff --git a/config.tests/static_link_order/staticlib1.cpp b/config.tests/static_link_order/staticlib1.cpp index 19caeead5ce..f120f9229bb 100644 --- a/config.tests/static_link_order/staticlib1.cpp +++ b/config.tests/static_link_order/staticlib1.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: BSD-3-Clause void objLibFunc(); diff --git a/config.tests/static_link_order/staticlib2.cpp b/config.tests/static_link_order/staticlib2.cpp index 61089d53bd1..a9abf424fe2 100644 --- a/config.tests/static_link_order/staticlib2.cpp +++ b/config.tests/static_link_order/staticlib2.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: BSD-3-Clause void staticLibFunc2() { } diff --git a/config.tests/x86_simd/main.cpp b/config.tests/x86_simd/main.cpp index 5af3496769d..8634e29cf20 100644 --- a/config.tests/x86_simd/main.cpp +++ b/config.tests/x86_simd/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 Intel Corporation. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: BSD-3-Clause // All of our supported compilers support #include diff --git a/config.tests/x86intrin/main.cpp b/config.tests/x86intrin/main.cpp index 297586fb4e7..2e6b1987109 100644 --- a/config.tests/x86intrin/main.cpp +++ b/config.tests/x86intrin/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 Intel Corporation. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: BSD-3-Clause #include