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/plugins/serialterminal | |
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/plugins/serialterminal')
-rw-r--r-- | src/plugins/serialterminal/consolelineedit.cpp | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/consolelineedit.h | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialcontrol.cpp | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialcontrol.h | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialdevicemodel.cpp | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialdevicemodel.h | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialoutputpane.cpp | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialoutputpane.h | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialterminalconstants.h | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialterminalplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialterminalplugin.h | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialterminalsettings.cpp | 2 | ||||
-rw-r--r-- | src/plugins/serialterminal/serialterminalsettings.h | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/serialterminal/consolelineedit.cpp b/src/plugins/serialterminal/consolelineedit.cpp index 1b9a0af7de9..59358984652 100644 --- a/src/plugins/serialterminal/consolelineedit.cpp +++ b/src/plugins/serialterminal/consolelineedit.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #include "consolelineedit.h" #include "serialterminalconstants.h" diff --git a/src/plugins/serialterminal/consolelineedit.h b/src/plugins/serialterminal/consolelineedit.h index 2dd27029b4b..57c2aff35f5 100644 --- a/src/plugins/serialterminal/consolelineedit.h +++ b/src/plugins/serialterminal/consolelineedit.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #pragma once diff --git a/src/plugins/serialterminal/serialcontrol.cpp b/src/plugins/serialterminal/serialcontrol.cpp index 9452fa721e6..b4eb099123c 100644 --- a/src/plugins/serialterminal/serialcontrol.cpp +++ b/src/plugins/serialterminal/serialcontrol.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #include "serialcontrol.h" #include "serialterminalconstants.h" diff --git a/src/plugins/serialterminal/serialcontrol.h b/src/plugins/serialterminal/serialcontrol.h index 2de16888f5f..a530092804e 100644 --- a/src/plugins/serialterminal/serialcontrol.h +++ b/src/plugins/serialterminal/serialcontrol.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #pragma once diff --git a/src/plugins/serialterminal/serialdevicemodel.cpp b/src/plugins/serialterminal/serialdevicemodel.cpp index a4cfee906a8..789ee8c68cf 100644 --- a/src/plugins/serialterminal/serialdevicemodel.cpp +++ b/src/plugins/serialterminal/serialdevicemodel.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #include "serialdevicemodel.h" diff --git a/src/plugins/serialterminal/serialdevicemodel.h b/src/plugins/serialterminal/serialdevicemodel.h index b779fe11148..b149796056a 100644 --- a/src/plugins/serialterminal/serialdevicemodel.h +++ b/src/plugins/serialterminal/serialdevicemodel.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #pragma once diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp index bfbaa579756..713190c16ab 100644 --- a/src/plugins/serialterminal/serialoutputpane.cpp +++ b/src/plugins/serialterminal/serialoutputpane.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #include "serialoutputpane.h" diff --git a/src/plugins/serialterminal/serialoutputpane.h b/src/plugins/serialterminal/serialoutputpane.h index b36f538980b..af0772a1f3d 100644 --- a/src/plugins/serialterminal/serialoutputpane.h +++ b/src/plugins/serialterminal/serialoutputpane.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #pragma once diff --git a/src/plugins/serialterminal/serialterminalconstants.h b/src/plugins/serialterminal/serialterminalconstants.h index ebac7e1b740..58cbb4f36e3 100644 --- a/src/plugins/serialterminal/serialterminalconstants.h +++ b/src/plugins/serialterminal/serialterminalconstants.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #pragma once diff --git a/src/plugins/serialterminal/serialterminalplugin.cpp b/src/plugins/serialterminal/serialterminalplugin.cpp index 58386a1b982..d8a0bf19cf6 100644 --- a/src/plugins/serialterminal/serialterminalplugin.cpp +++ b/src/plugins/serialterminal/serialterminalplugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #include "serialterminalplugin.h" diff --git a/src/plugins/serialterminal/serialterminalplugin.h b/src/plugins/serialterminal/serialterminalplugin.h index 099076ee2fb..18da3120dab 100644 --- a/src/plugins/serialterminal/serialterminalplugin.h +++ b/src/plugins/serialterminal/serialterminalplugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #pragma once diff --git a/src/plugins/serialterminal/serialterminalsettings.cpp b/src/plugins/serialterminal/serialterminalsettings.cpp index 348b81fe072..87e8824c0f0 100644 --- a/src/plugins/serialterminal/serialterminalsettings.cpp +++ b/src/plugins/serialterminal/serialterminalsettings.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #include "serialterminalsettings.h" #include "serialterminalconstants.h" diff --git a/src/plugins/serialterminal/serialterminalsettings.h b/src/plugins/serialterminal/serialterminalsettings.h index 20facf9906c..b2a4ec84e43 100644 --- a/src/plugins/serialterminal/serialterminalsettings.h +++ b/src/plugins/serialterminal/serialterminalsettings.h @@ -1,5 +1,5 @@ // Copyright (C) 2018 Benjamin Balga -// 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 #pragma once |