summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucie Gérard <lucie.gerard@qt.io>2024-03-19 14:31:33 +0100
committerLucie Gérard <lucie.gerard@qt.io>2024-04-09 16:26:18 +0200
commit67d10ced1f702de3a582da47fa657a724aa6a2bf (patch)
treea8c926e04c0e7ee1c4076aa53b23d7998392bdef
parent1a095bff4abb6ab865db7abba70f93cb7167f889 (diff)
Change license for tools files
According to QUIP-18 [1], all tools files should be LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 6.7.0 Task-number: QTBUG-121787 Change-Id: I7b69118185d4237ec096dc76e78ee84c2ccd5eb2 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
-rw-r--r--src/assistant/qhelpgenerator/collectionconfigreader.cpp2
-rw-r--r--src/assistant/qhelpgenerator/collectionconfigreader.h2
-rw-r--r--src/assistant/qhelpgenerator/helpgenerator.cpp2
-rw-r--r--src/assistant/qhelpgenerator/helpgenerator.h2
-rw-r--r--src/assistant/qhelpgenerator/qhelpdatainterface.cpp2
-rw-r--r--src/assistant/qhelpgenerator/qhelpdatainterface_p.h2
-rw-r--r--src/assistant/qhelpgenerator/qhelpprojectdata.cpp2
-rw-r--r--src/assistant/qhelpgenerator/qhelpprojectdata_p.h2
-rw-r--r--src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp2
-rw-r--r--src/qdoc/qdoc/src/qdoc/clangcodeparser.h2
-rw-r--r--src/qdoc/qdoc/src/qdoc/template_declaration.h2
11 files changed, 11 insertions, 11 deletions
diff --git a/src/assistant/qhelpgenerator/collectionconfigreader.cpp b/src/assistant/qhelpgenerator/collectionconfigreader.cpp
index 44abd9e8b..d395e63fe 100644
--- a/src/assistant/qhelpgenerator/collectionconfigreader.cpp
+++ b/src/assistant/qhelpgenerator/collectionconfigreader.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2018 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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "collectionconfigreader.h"
diff --git a/src/assistant/qhelpgenerator/collectionconfigreader.h b/src/assistant/qhelpgenerator/collectionconfigreader.h
index 78047a51f..0d6de5de4 100644
--- a/src/assistant/qhelpgenerator/collectionconfigreader.h
+++ b/src/assistant/qhelpgenerator/collectionconfigreader.h
@@ -1,5 +1,5 @@
// Copyright (C) 2018 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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef COLLECTIONCONFIGREADER_H
#define COLLECTIONCONFIGREADER_H
diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
index 6061b3460..802830ad1 100644
--- a/src/assistant/qhelpgenerator/helpgenerator.cpp
+++ b/src/assistant/qhelpgenerator/helpgenerator.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "helpgenerator.h"
#include "qhelpprojectdata_p.h"
diff --git a/src/assistant/qhelpgenerator/helpgenerator.h b/src/assistant/qhelpgenerator/helpgenerator.h
index 6948467da..8c5ef343d 100644
--- a/src/assistant/qhelpgenerator/helpgenerator.h
+++ b/src/assistant/qhelpgenerator/helpgenerator.h
@@ -1,5 +1,5 @@
// Copyright (C) 2016 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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef HELPGENERATOR_H
#define HELPGENERATOR_H
diff --git a/src/assistant/qhelpgenerator/qhelpdatainterface.cpp b/src/assistant/qhelpgenerator/qhelpdatainterface.cpp
index fa0909654..f5a9afdd4 100644
--- a/src/assistant/qhelpgenerator/qhelpdatainterface.cpp
+++ b/src/assistant/qhelpgenerator/qhelpdatainterface.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "qhelpdatainterface_p.h"
diff --git a/src/assistant/qhelpgenerator/qhelpdatainterface_p.h b/src/assistant/qhelpgenerator/qhelpdatainterface_p.h
index 1c8dd4fb8..6f215313e 100644
--- a/src/assistant/qhelpgenerator/qhelpdatainterface_p.h
+++ b/src/assistant/qhelpgenerator/qhelpdatainterface_p.h
@@ -1,5 +1,5 @@
// Copyright (C) 2016 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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef QHELPDATAINTERFACE_H
#define QHELPDATAINTERFACE_H
diff --git a/src/assistant/qhelpgenerator/qhelpprojectdata.cpp b/src/assistant/qhelpgenerator/qhelpprojectdata.cpp
index 77faa0625..01cf2388c 100644
--- a/src/assistant/qhelpgenerator/qhelpprojectdata.cpp
+++ b/src/assistant/qhelpgenerator/qhelpprojectdata.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "qhelpprojectdata_p.h"
diff --git a/src/assistant/qhelpgenerator/qhelpprojectdata_p.h b/src/assistant/qhelpgenerator/qhelpprojectdata_p.h
index c50c1e959..6eab2864e 100644
--- a/src/assistant/qhelpgenerator/qhelpprojectdata_p.h
+++ b/src/assistant/qhelpgenerator/qhelpprojectdata_p.h
@@ -1,5 +1,5 @@
// Copyright (C) 2016 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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef QHELPPROJECTDATA_H
#define QHELPPROJECTDATA_H
diff --git a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
index 0712481e7..74e0e044b 100644
--- a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "clangcodeparser.h"
diff --git a/src/qdoc/qdoc/src/qdoc/clangcodeparser.h b/src/qdoc/qdoc/src/qdoc/clangcodeparser.h
index c702bfe1e..ea330c202 100644
--- a/src/qdoc/qdoc/src/qdoc/clangcodeparser.h
+++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef CLANGCODEPARSER_H
#define CLANGCODEPARSER_H
diff --git a/src/qdoc/qdoc/src/qdoc/template_declaration.h b/src/qdoc/qdoc/src/qdoc/template_declaration.h
index 160dfd695..a0aade682 100644
--- a/src/qdoc/qdoc/src/qdoc/template_declaration.h
+++ b/src/qdoc/qdoc/src/qdoc/template_declaration.h
@@ -1,5 +1,5 @@
// Copyright (C) 2023 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: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once