diff options
author | Kai Köhne <kai.koehne@qt.io> | 2023-01-04 08:52:22 +0100 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2023-01-10 08:05:04 +0000 |
commit | 4e9c1d126c6f09b8813bc2ebc6cc195ef8d2c01c (patch) | |
tree | 3af15f8ed49a2fca408aeb3dcca726eaecc56f04 /scripts | |
parent | aee7afd50ba8bd91b1191db6f81b1bd3d8a068e1 (diff) |
GPL-3.0 is deprecated by SPDX.
Change done by
find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \;
Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'scripts')
28 files changed, 28 insertions, 28 deletions
diff --git a/scripts/build.py b/scripts/build.py index ee83021fb9..ae1b450f91 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # Copyright (C) 2020 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 # import the print function which is used in python 3.x from __future__ import print_function diff --git a/scripts/build_plugin.py b/scripts/build_plugin.py index df06908c9d..38d247d4d5 100755 --- a/scripts/build_plugin.py +++ b/scripts/build_plugin.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # Copyright (C) 2020 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 # import the print function which is used in python 3.x from __future__ import print_function diff --git a/scripts/checkInstalledFiles.py b/scripts/checkInstalledFiles.py index 31d9da1beb..72ec730f6f 100755 --- a/scripts/checkInstalledFiles.py +++ b/scripts/checkInstalledFiles.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 import os import sys diff --git a/scripts/clangCompleteAt.sh b/scripts/clangCompleteAt.sh index db80207ff2..ba7054ee97 100755 --- a/scripts/clangCompleteAt.sh +++ b/scripts/clangCompleteAt.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 # --- helpers ----------------------------------------------------------------- diff --git a/scripts/clazyweb2tasks.pl b/scripts/clazyweb2tasks.pl index 469ce075c8..88679626b0 100755 --- a/scripts/clazyweb2tasks.pl +++ b/scripts/clazyweb2tasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Copyright (C) 2017 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 =head1 NAME diff --git a/scripts/common.py b/scripts/common.py index fd57ccd2d1..d295b5763b 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -1,5 +1,5 @@ # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 import os import locale diff --git a/scripts/dependencyinfo.py b/scripts/dependencyinfo.py index d6c32dce2c..ea7d698c29 100755 --- a/scripts/dependencyinfo.py +++ b/scripts/dependencyinfo.py @@ -1,7 +1,7 @@ #! /usr/bin/env python2 # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 import glob import json diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index efcde54bdf..6ef3fcdb8d 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 [ $# -lt 5 ] && echo "Usage: $(basename $0) <app folder> <qt bin folder> <qt translations folder> <qt plugin folder> <qt quick 2 imports folder>" && exit 2 [ $(uname -s) != "Darwin" ] && echo "Run this script on Mac OS X" && exit 2; diff --git a/scripts/fixCopyright.sh b/scripts/fixCopyright.sh index f06d13240f..c5026b0c61 100755 --- a/scripts/fixCopyright.sh +++ b/scripts/fixCopyright.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 # Prepend a copyright header to all files given on the command line. # Sample usage: diff --git a/scripts/fix_makefile_header_dependencies.sh b/scripts/fix_makefile_header_dependencies.sh index 23d81e005f..28f5b164c2 100755 --- a/scripts/fix_makefile_header_dependencies.sh +++ b/scripts/fix_makefile_header_dependencies.sh @@ -1,7 +1,7 @@ #! /usr/bin/env bash # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 WORKER=./fill_deps.sh DEPFILE=deps diff --git a/scripts/flake2tasks.py b/scripts/flake2tasks.py index 7fcad2ec3b..f84ea8c71e 100755 --- a/scripts/flake2tasks.py +++ b/scripts/flake2tasks.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # Copyright (C) 2019 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 ''' flake2tasks.py - Convert flake8 warnings into Qt Creator task files. diff --git a/scripts/gcc2tasks.pl b/scripts/gcc2tasks.pl index 5e59b6fb3a..4cb3d90c8c 100755 --- a/scripts/gcc2tasks.pl +++ b/scripts/gcc2tasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 =head1 NAME diff --git a/scripts/generateClangFormatChecksLayout.py b/scripts/generateClangFormatChecksLayout.py index e604e4d0f7..03f8c7830d 100755 --- a/scripts/generateClangFormatChecksLayout.py +++ b/scripts/generateClangFormatChecksLayout.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3.10 # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 import argparse import os diff --git a/scripts/hasCopyright.pl b/scripts/hasCopyright.pl index 42efd34248..b6968a2782 100755 --- a/scripts/hasCopyright.pl +++ b/scripts/hasCopyright.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 # Report possible problems with copy right headers # diff --git a/scripts/krazy2tasks.pl b/scripts/krazy2tasks.pl index 5f7d3ece19..54264ab376 100755 --- a/scripts/krazy2tasks.pl +++ b/scripts/krazy2tasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 use strict; diff --git a/scripts/makedmg.py b/scripts/makedmg.py index 040e3ff991..e90846176f 100755 --- a/scripts/makedmg.py +++ b/scripts/makedmg.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # Copyright (C) 2018 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 import argparse import os diff --git a/scripts/msanalyzer2tasks.pl b/scripts/msanalyzer2tasks.pl index 03b7234005..8cf174f2ba 100755 --- a/scripts/msanalyzer2tasks.pl +++ b/scripts/msanalyzer2tasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 =head1 NAME diff --git a/scripts/msvc2tasks.pl b/scripts/msvc2tasks.pl index 4b6abdfcd4..b45acddb61 100755 --- a/scripts/msvc2tasks.pl +++ b/scripts/msvc2tasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 =head1 NAME diff --git a/scripts/mytasks.pl b/scripts/mytasks.pl index 18baa515e0..1380a64238 100755 --- a/scripts/mytasks.pl +++ b/scripts/mytasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 use strict; diff --git a/scripts/perltest2tasks.pl b/scripts/perltest2tasks.pl index 9eb3ffb67e..db2641e340 100755 --- a/scripts/perltest2tasks.pl +++ b/scripts/perltest2tasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Copyright (C) 2017 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 =head1 NAME diff --git a/scripts/purify2tasks.pl b/scripts/purify2tasks.pl index 423201edf1..284985345e 100755 --- a/scripts/purify2tasks.pl +++ b/scripts/purify2tasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 =head1 NAME diff --git a/scripts/qdoc2tasks.pl b/scripts/qdoc2tasks.pl index 382448ed22..986246b2ca 100755 --- a/scripts/qdoc2tasks.pl +++ b/scripts/qdoc2tasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 =head1 NAME diff --git a/scripts/scrubts.py b/scripts/scrubts.py index 9a863970b6..e0f24dff2f 100644 --- a/scripts/scrubts.py +++ b/scripts/scrubts.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 # See argparse description in main # diff --git a/scripts/shiboken2tasks.py b/scripts/shiboken2tasks.py index d906e0d8ba..d353c9c02f 100755 --- a/scripts/shiboken2tasks.py +++ b/scripts/shiboken2tasks.py @@ -1,5 +1,5 @@ # Copyright (C) 2020 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 ''' shiboken2tasks.py - Convert shiboken warnings into Qt Creator task files. diff --git a/scripts/sphinx2tasks.pl b/scripts/sphinx2tasks.pl index 91fce0e4f5..f479d52ce0 100755 --- a/scripts/sphinx2tasks.pl +++ b/scripts/sphinx2tasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # Copyright (C) 2018 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 =head1 NAME diff --git a/scripts/test2tasks.pl b/scripts/test2tasks.pl index d4c05b17ef..cd8b7e7769 100755 --- a/scripts/test2tasks.pl +++ b/scripts/test2tasks.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 =head1 NAME diff --git a/scripts/uichanges.py b/scripts/uichanges.py index 2dbbdf8e9b..f204a28f4e 100755 --- a/scripts/uichanges.py +++ b/scripts/uichanges.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 """ A simple program that parses untranslated.ts files diff --git a/scripts/updateCopyright.pl b/scripts/updateCopyright.pl index 3b384012b7..ed854302c1 100755 --- a/scripts/updateCopyright.pl +++ b/scripts/updateCopyright.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial 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 use strict; |