diff options
| author | Tarja Sundqvist <[email protected]> | 2025-05-31 19:34:47 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2025-06-09 09:04:53 +0000 |
| commit | fb2b8eda0259eb4f78db1d87332869cd49180d6f (patch) | |
| tree | 51fcd22b9932d71115e9e5271210ed429035c3ac | |
| parent | d3cf878098cf399b00ecfa741e3d9d7d7964e42b (diff) | |
Revert "Update commercial SPDX-License-Identifier"v6.5.5-lts-lgpl6.5.5
This reverts commit 9918023a5e9722f7fc1b8891d63408c219974424.
The revert is needed for the opensource releases which cannot contain commercial license headers.
Conflicts solved (files were originally wrongly updated but
fixed already to tqtc/lts-6.5-opensource):
src/glslparser/glslparsertable.cpp
src/glslparser/glslparsertable_p.h
src/glslparser/make-parser.sh
Change-Id: Iad2c0612135edc5d325998cca3c25b737d18c3c9
Reviewed-by: Jani Heikkinen <[email protected]>
(cherry picked from commit 39e23c6e439b834483f3c99be90a3c0dbd5f20d5)
7 files changed, 6 insertions, 7 deletions
diff --git a/src/glslparser/glslparsertable_p.h b/src/glslparser/glslparsertable_p.h index 7f0ae323..badca28a 100644 --- a/src/glslparser/glslparsertable_p.h +++ b/src/glslparser/glslparsertable_p.h @@ -1,6 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - // // W A R N I N G // ------------- diff --git a/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapter.cpp b/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapter.cpp index 014399ac..2577acd2 100644 --- a/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapter.cpp +++ b/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapter.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qquick3dprofileradapter.h" diff --git a/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapter.h b/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapter.h index 03630975..5d378594 100644 --- a/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapter.h +++ b/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapter.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QQUICK3DPROFILERADAPTER_H #define QQUICK3DPROFILERADAPTER_H diff --git a/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapterfactory.cpp b/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapterfactory.cpp index 7024f047..a0b6d7de 100644 --- a/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapterfactory.cpp +++ b/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapterfactory.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qquick3dprofileradapterfactory.h" #include "qquick3dprofileradapter.h" diff --git a/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapterfactory.h b/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapterfactory.h index 5d5af819..aeed693c 100644 --- a/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapterfactory.h +++ b/src/plugins/qmldbg_quick3dprofiler/qquick3dprofileradapterfactory.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QQUICK3DPROFILERADAPTERFACTORY_H #define QQUICK3DPROFILERADAPTERFACTORY_H diff --git a/src/utils/qquick3dprofiler.cpp b/src/utils/qquick3dprofiler.cpp index 63dba581..07a270f2 100644 --- a/src/utils/qquick3dprofiler.cpp +++ b/src/utils/qquick3dprofiler.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qquick3dprofiler_p.h" diff --git a/src/utils/qquick3dprofiler_p.h b/src/utils/qquick3dprofiler_p.h index e7665cd7..c4c752fb 100644 --- a/src/utils/qquick3dprofiler_p.h +++ b/src/utils/qquick3dprofiler_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QQUICK3DPROFILER_P_H #define QQUICK3DPROFILER_P_H |