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 <[email protected]>

19 files changed, 19 insertions, 19 deletions

diff --git a/src/plugins/clangcodemodel/test/activationsequenceprocessortest.cpp b/src/plugins/clangcodemodel/test/activationsequenceprocessortest.cpp
index a3cb8921617..3ea86d85ff9 100644
--- a/src/plugins/clangcodemodel/test/activationsequenceprocessortest.cpp
+++ b/src/plugins/clangcodemodel/test/activationsequenceprocessortest.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2022 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
 
 #include "activationsequenceprocessortest.h"
 
diff --git a/src/plugins/clangcodemodel/test/activationsequenceprocessortest.h b/src/plugins/clangcodemodel/test/activationsequenceprocessortest.h
index 25b05295f1b..63c9059b03a 100644
--- a/src/plugins/clangcodemodel/test/activationsequenceprocessortest.h
+++ b/src/plugins/clangcodemodel/test/activationsequenceprocessortest.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2022 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
 
 #pragma once
 
diff --git a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
index 48e66f1ded5..1f0219df997 100644
--- a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
+++ b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 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
 
 #include "clangbatchfileprocessor.h"
 
diff --git a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h
index eaf9a5d4842..942269b3648 100644
--- a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h
+++ b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 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
 
 #pragma once
 
diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp
index c175ac6a31e..4636b6cd26a 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
 
 #include "clangdtests.h"
 
diff --git a/src/plugins/clangcodemodel/test/clangdtests.h b/src/plugins/clangcodemodel/test/clangdtests.h
index 7f0bdb41ebb..2a8f33579c2 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.h
+++ b/src/plugins/clangcodemodel/test/clangdtests.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
 
 #pragma once
 
diff --git a/src/plugins/clangcodemodel/test/clangfixittest.cpp b/src/plugins/clangcodemodel/test/clangfixittest.cpp
index ec73e926338..7cb58151d87 100644
--- a/src/plugins/clangcodemodel/test/clangfixittest.cpp
+++ b/src/plugins/clangcodemodel/test/clangfixittest.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #include "clangfixittest.h"
 
diff --git a/src/plugins/clangcodemodel/test/clangfixittest.h b/src/plugins/clangcodemodel/test/clangfixittest.h
index 7148f16b48b..8f7c0de96e8 100644
--- a/src/plugins/clangcodemodel/test/clangfixittest.h
+++ b/src/plugins/clangcodemodel/test/clangfixittest.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2022 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
 
 #pragma once
 
diff --git a/src/plugins/clangcodemodel/test/data/completion/main.cpp b/src/plugins/clangcodemodel/test/data/completion/main.cpp
index f484dfa9999..727301ba597 100644
--- a/src/plugins/clangcodemodel/test/data/completion/main.cpp
+++ b/src/plugins/clangcodemodel/test/data/completion/main.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #include "mainwindow.h"
 #include <QApplication>
diff --git a/src/plugins/clangcodemodel/test/data/completion/mainwindow.cpp b/src/plugins/clangcodemodel/test/data/completion/mainwindow.cpp
index 6fb327b6345..c27a512e470 100644
--- a/src/plugins/clangcodemodel/test/data/completion/mainwindow.cpp
+++ b/src/plugins/clangcodemodel/test/data/completion/mainwindow.cpp
@@ -1,5 +1,5 @@
 // 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
 
 
 
diff --git a/src/plugins/clangcodemodel/test/data/completion/mainwindow.h b/src/plugins/clangcodemodel/test/data/completion/mainwindow.h
index 9f133ba49f5..9d02ad6d3b1 100644
--- a/src/plugins/clangcodemodel/test/data/completion/mainwindow.h
+++ b/src/plugins/clangcodemodel/test/data/completion/mainwindow.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/plugins/clangcodemodel/test/data/follow-symbol/header.h b/src/plugins/clangcodemodel/test/data/follow-symbol/header.h
index b76f2687beb..c95139a2838 100644
--- a/src/plugins/clangcodemodel/test/data/follow-symbol/header.h
+++ b/src/plugins/clangcodemodel/test/data/follow-symbol/header.h
@@ -1,5 +1,5 @@
 // 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
 
 
 
diff --git a/src/plugins/clangcodemodel/test/data/follow-symbol/main.cpp b/src/plugins/clangcodemodel/test/data/follow-symbol/main.cpp
index 9f7349d0580..3a1d86b5027 100644
--- a/src/plugins/clangcodemodel/test/data/follow-symbol/main.cpp
+++ b/src/plugins/clangcodemodel/test/data/follow-symbol/main.cpp
@@ -1,5 +1,5 @@
 // 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
 
 
 
diff --git a/src/plugins/clangcodemodel/test/data/objc_messages_1.mm b/src/plugins/clangcodemodel/test/data/objc_messages_1.mm
index adb963377b4..44f4d478dd8 100644
--- a/src/plugins/clangcodemodel/test/data/objc_messages_1.mm
+++ b/src/plugins/clangcodemodel/test/data/objc_messages_1.mm
@@ -1,5 +1,5 @@
 // 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
 
 /*
  * Expected texts:
diff --git a/src/plugins/clangcodemodel/test/data/objc_messages_2.mm b/src/plugins/clangcodemodel/test/data/objc_messages_2.mm
index 57383f97bd1..442441cfec8 100644
--- a/src/plugins/clangcodemodel/test/data/objc_messages_2.mm
+++ b/src/plugins/clangcodemodel/test/data/objc_messages_2.mm
@@ -1,5 +1,5 @@
 // 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
 
 @interface PopCornTracker {
     int _quality;
diff --git a/src/plugins/clangcodemodel/test/data/objc_messages_3.mm b/src/plugins/clangcodemodel/test/data/objc_messages_3.mm
index 9dc8e5b6159..99ee264dc3d 100644
--- a/src/plugins/clangcodemodel/test/data/objc_messages_3.mm
+++ b/src/plugins/clangcodemodel/test/data/objc_messages_3.mm
@@ -1,5 +1,5 @@
 // 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
 
 @protocol Aaaa
 @end
diff --git a/src/plugins/clangcodemodel/test/data/qt-widgets-app/main.cpp b/src/plugins/clangcodemodel/test/data/qt-widgets-app/main.cpp
index f484dfa9999..727301ba597 100644
--- a/src/plugins/clangcodemodel/test/data/qt-widgets-app/main.cpp
+++ b/src/plugins/clangcodemodel/test/data/qt-widgets-app/main.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #include "mainwindow.h"
 #include <QApplication>
diff --git a/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.cpp b/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.cpp
index ed62e965091..6269ffc6259 100644
--- a/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.cpp
+++ b/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
diff --git a/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.h b/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.h
index 9f133ba49f5..9d02ad6d3b1 100644
--- a/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.h
+++ b/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once