diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-12-21 10:12:09 +0100 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2023-01-06 11:15:13 +0000 |
| commit | 56baf8c058792187b574cf988fcf4b313f527156 (patch) | |
| tree | a9bb31e87e9e962f756d8477477785ea7b8fca47 /src/share | |
| parent | 126d1d009e64bc39529cd1a118ad8c22e9f7fdfe (diff) | |
Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...
While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only
Change was done by running
find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;
Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/share')
| -rw-r--r-- | src/share/qtcreator/externaltools/lrelease.xml | 2 | ||||
| -rw-r--r-- | src/share/qtcreator/externaltools/lupdate.xml | 2 | ||||
| -rw-r--r-- | src/share/qtcreator/externaltools/notepad_win.xml | 2 | ||||
| -rw-r--r-- | src/share/qtcreator/externaltools/qml.xml | 2 | ||||
| -rw-r--r-- | src/share/qtcreator/externaltools/qmlscene.xml | 2 | ||||
| -rw-r--r-- | src/share/qtcreator/externaltools/vi.xml | 2 | ||||
| -rw-r--r-- | src/share/qtcreator/externaltools/vi_mac.xml | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/share/qtcreator/externaltools/lrelease.xml b/src/share/qtcreator/externaltools/lrelease.xml index 36aa929dd4..deb9aa0132 100644 --- a/src/share/qtcreator/externaltools/lrelease.xml +++ b/src/share/qtcreator/externaltools/lrelease.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 --> <externaltool id="lrelease"> diff --git a/src/share/qtcreator/externaltools/lupdate.xml b/src/share/qtcreator/externaltools/lupdate.xml index a6ddf94f75..2e885ef3ed 100644 --- a/src/share/qtcreator/externaltools/lupdate.xml +++ b/src/share/qtcreator/externaltools/lupdate.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 --> <externaltool id="lupdate"> diff --git a/src/share/qtcreator/externaltools/notepad_win.xml b/src/share/qtcreator/externaltools/notepad_win.xml index 0a4eb748d3..cb7c95c350 100644 --- a/src/share/qtcreator/externaltools/notepad_win.xml +++ b/src/share/qtcreator/externaltools/notepad_win.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 --> <externaltool id="notepad"> diff --git a/src/share/qtcreator/externaltools/qml.xml b/src/share/qtcreator/externaltools/qml.xml index 31b4c775fc..ec2cc5a9a7 100644 --- a/src/share/qtcreator/externaltools/qml.xml +++ b/src/share/qtcreator/externaltools/qml.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 --> <externaltool id="qml"> diff --git a/src/share/qtcreator/externaltools/qmlscene.xml b/src/share/qtcreator/externaltools/qmlscene.xml index 7d66f4b42c..ff8751a7ed 100644 --- a/src/share/qtcreator/externaltools/qmlscene.xml +++ b/src/share/qtcreator/externaltools/qmlscene.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 --> <externaltool id="qmlscene"> diff --git a/src/share/qtcreator/externaltools/vi.xml b/src/share/qtcreator/externaltools/vi.xml index c75943835b..68731a6bd9 100644 --- a/src/share/qtcreator/externaltools/vi.xml +++ b/src/share/qtcreator/externaltools/vi.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 --> <externaltool id="vi"> diff --git a/src/share/qtcreator/externaltools/vi_mac.xml b/src/share/qtcreator/externaltools/vi_mac.xml index e6ee7ba26f..3b84dabf76 100644 --- a/src/share/qtcreator/externaltools/vi_mac.xml +++ b/src/share/qtcreator/externaltools/vi_mac.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 --> <externaltool id="vi"> |