Merge remote-tracking branch 'origin/10.0' into qds/dev

bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7

29 files changed, 259 insertions, 218 deletions

diff --git a/scripts/build.py b/scripts/build.py
index ee83021fb9..d6a30a18ff 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
@@ -189,7 +189,7 @@ def build_qtcreator(args, paths):
     if args.with_cpack:
         cmake_args += ['-DCPACK_PACKAGE_FILE_NAME=qtcreator' + args.zip_infix]
         if common.is_linux_platform():
-            cmake_args += ['-DCPACK_INSTALL_PREFIX=/opt']
+            cmake_args += ['-DCPACK_INSTALL_PREFIX=/opt/qt-creator']
 
     cmake_args += args.config_args
 
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
new file mode 100755
index 0000000000..03f8c7830d
--- /dev/null
+++ b/scripts/generateClangFormatChecksLayout.py
@@ -0,0 +1,231 @@
+#!/usr/bin/env python3.10
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import argparse
+import os
+# for installing use pip3 install robotpy-cppheaderparse
+import CppHeaderParser
+
+def parse_arguments():
+    parser = argparse.ArgumentParser(description='Clang-Format checks header file \
+    generator')
+    parser.add_argument('--clang-format-header-file', help='path to \
+    Format.h usually /usr/lib/llvm-x/include/clang/Format/Format.h',
+                        default=None, dest='options_header', required=True)
+    return parser.parse_args()
+
+
+def full_header_content(header_code):
+    return '''// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT!
+
+#pragma once
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+class QCheckBox;
+class QComboBox;
+class QLabel;
+class QLineEdit;
+class QPlainTextEdit;
+class QPushButton;
+class QWidget;
+QT_END_NAMESPACE
+
+namespace ClangFormat {
+
+class ClangFormatChecks : public QWidget
+{
+    Q_OBJECT
+public:
+    ClangFormatChecks(QWidget *parent = nullptr);
+
+private:
+''' + header_code + '''
+};
+
+} //ClangFormat
+'''
+
+
+def full_source_content(source_code, layout_code):
+    return '''// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT!
+
+#include "clangformatchecks.h"
+
+#include <utils/layoutbuilder.h>
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QWidget>
+
+using namespace Utils;
+
+using namespace ClangFormat;
+
+ClangFormatChecks::ClangFormatChecks(QWidget *parent)
+    : QWidget(parent)
+{
+''' + source_code + '''
+    using namespace Layouting;
+
+    Grid {
+''' + layout_code + '''    }.attachTo(this);
+}
+'''
+
+#   Combobox UI
+def combobox_header(name):
+    header = "    QComboBox *m_" + name + " = nullptr;\n"
+    return header
+
+def combobox_source(name, values, offset):
+    source = ""
+    source += "    m_" + name + " = new QComboBox(this);\n"
+
+    list = ""
+    for value in values:
+        list += "\"" + value + "\","
+
+    source += "    m_" + name + "->addItems({" + list + "});\n"
+    source += "    m_" + name + "->setObjectName(\"" + name + "\");\n\n"
+    return source
+
+def combobox_source_bool(name, offset):
+    return combobox_source(name, ["Default", "true", "false"], offset)
+
+def combobox_layout(name, offset):
+    layout = "        new QLabel(\"" + offset + name + "\"), m_" + name + ", br,\n"
+    return layout
+
+#   String UI
+def string_header(name):
+    header = "    QLineEdit *m_" + name + " = nullptr;\n"
+    header += "    QPushButton *m_set" + name + " = nullptr;\n"
+    return header
+
+def string_source(name, offset):
+    source = ""
+    source += "    m_" + name + " = new QLineEdit(this);\n"
+    source += "    m_" + name + "->setObjectName(\"" + name + "\");\n"
+    source += "    m_set" + name + " = new QPushButton(\"Set\", this);\n\n"
+    source += "    m_set" + name + "->setObjectName(\"set" + name + "\");\n"
+#    source += "m_" + name + "->setObjectName(\"" + offset + name + "\");\n\n"
+    return source
+
+def string_layout(name, offset):
+    layout = "        new QLabel(\"" + offset + name + "\"), Row {m_" + name + ", m_set" + name + "}, br,\n"
+    return layout
+
+#   Vector UI
+def vector_header(name):
+    header = "    QPlainTextEdit *m_" + name + " = nullptr;\n"
+    header += "    QPushButton *m_set" + name + " = nullptr;\n"
+    return header
+
+def vector_source(name, offset):
+    source = ""
+    source += "    m_" + name + " = new QPlainTextEdit(this);\n"
+    source += "    m_" + name + "->setObjectName(\"" + name + "\");\n"
+    source += "    m_" + name + "->setFixedHeight(100);\n"
+    source += "    m_set" + name + " = new QPushButton(\"Set\", this);\n\n"
+    source += "    m_set" + name + "->setObjectName(\"set" + name + "\");\n"
+#    source += "m_" + name + "->setObjectName(\"" + offset + name + "\");\n\n"
+    return source
+
+def vector_layout(name, offset):
+    layout = "        new QLabel(\"" + offset + name + "\"), Row {m_" + name + ", m_set" + name + "}, br,\n"
+    return layout
+
+#   Struct Layout
+def struct_layout(name, offset):
+    layout = "        new QLabel(\"" + offset + name + "\"), br,\n"
+    return layout
+
+
+def in_list(list, type):
+    for element in list:
+        if element["name"] == type:
+            return element;
+    return
+
+def create_private_variables(variables, enums, structs, offset = ""):
+    header = ""
+    source = ""
+    layout = ""
+
+    # create BasedOnStyle combobox ussually not presented in FormatStyle struct
+    if offset == "":
+        header += combobox_header("BasedOnStyle")
+        source += combobox_source("BasedOnStyle", ["LLVM", "Google", "Chromium", "Mozilla", "WebKit", "Microsoft", "GNU"], offset)
+        layout += combobox_layout("BasedOnStyle", offset)
+
+    for variable in variables:
+        if "doxygen" in variable.keys():
+            if ("**deprecated**" in variable['doxygen']):
+                continue;
+
+        type = variable["type"]
+        name = variable["name"]
+        enum = in_list(enums, type)
+        struct = in_list(structs, type)
+        if enum:
+            header += combobox_header(name)
+            source += combobox_source(name, [value["name"].split("_")[1] for value in enum["values"]], offset)
+            layout += combobox_layout(name, offset)
+        elif struct:
+            layout += struct_layout(name, offset)
+            header_tmp, source_tmp, layout_tmp = create_private_variables(struct["properties"]["public"], enums, structs, "  ")
+            header += header_tmp
+            source += source_tmp
+            layout += layout_tmp
+        elif "std::string" == type or "unsigned" == type or "int" == type:
+            header += string_header(name)
+            source += string_source(name, offset)
+            layout += string_layout(name, offset)
+        elif "std::vector<std::string >" == type:
+            header += vector_header(name)
+            source += vector_source(name, offset)
+            layout += vector_layout(name, offset)
+        elif "bool" == type:
+            header += combobox_header(name)
+            source += combobox_source_bool(name, offset)
+            layout += combobox_layout(name, offset);
+    return header, source, layout
+
+
+def main():
+    arguments = parse_arguments()
+    header = CppHeaderParser.CppHeader(arguments.options_header)
+
+    enums = header.classes["FormatStyle"]["enums"]["public"]
+    structs = header.classes["FormatStyle"]["nested_classes"]
+    variables = header.classes["FormatStyle"]["properties"]["public"]
+
+    current_path = os.path.dirname(os.path.abspath(__file__))
+    source_path = os.path.abspath(os.path.join(current_path, '..', 'src',
+                    'plugins', 'clangformat', 'clangformatchecks.cpp'))
+    header_path = os.path.abspath(os.path.join(current_path, '..', 'src',
+                    'plugins', 'clangformat', 'clangformatchecks.h'))
+
+    header, source, layout = create_private_variables(variables, enums, structs)
+    with open(source_path, 'w') as f:
+        f.write(full_source_content(source, layout))
+
+    with open(header_path, 'w') as f:
+        f.write(full_header_content(header))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/generateClangFormatChecksUI.py b/scripts/generateClangFormatChecksUI.py
deleted file mode 100755
index a0a9f37e1a..0000000000
--- a/scripts/generateClangFormatChecksUI.py
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/usr/bin/env python3.10
-# Copyright (C) 2019 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
-
-import argparse
-import os
-# for installing use pip3 install robotpy-cppheaderparse
-import CppHeaderParser
-
-def parse_arguments():
-    parser = argparse.ArgumentParser(description='Clazy checks header file \
-    generator')
-    parser.add_argument('--clang-format-header-file', help='path to \
-    Format.h usually /usr/lib/llvm-x/include/clang/Format/Format.h',
-                        default=None, dest='options_header', required=True)
-    return parser.parse_args()
-
-def full_ui_content(checks):
-    return '''<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ClangFormat::ClangFormatChecksWidget</class>
- <widget class="QWidget" name="ClangFormat::ClangFormatChecksWidget">
-  <property name="maximumSize">
-   <size>
-    <width>580</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <layout class="QGridLayout" name="checksLayout">
-''' + checks + '''  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
-'''
-
-def lable_ui(name, index, offset = ""):
-    return '''   <item row="''' + str(index) + '''" column="0">
-    <widget class="QLabel" name="label''' + name + '''">
-     <property name="text">
-      <string notr="true">''' + offset + name + '''</string>
-     </property>
-    </widget>
-   </item>
-'''
-
-def combobox_ui(name, values, index):
-    combobox = '''   <item row="''' + str(index) + '''" column="1">
-    <widget class="QComboBox" name="''' + name + '''">
-     <property name="focusPolicy">
-      <enum>Qt::StrongFocus</enum>
-     </property>
-'''
-    for value in values:
-        combobox += '''     <item>
-      <property name="text">
-       <string notr="true">''' + value + '''</string>
-      </property>
-     </item>
-'''
-    # for
-    combobox += '''    </widget>
-   </item>
-'''
-    return combobox
-
-def string_ui(name, index):
-    return '''   <item row="''' + str(index) + '''" column="1">
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QLineEdit" name="''' + name + '''">
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="set''' + name + '''">
-       <property name="maximumSize">
-        <size>
-         <width>40</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="text">
-        <string notr="true">Set</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-'''
-
-def vector_ui(name, index):
-    return '''   <item row="''' + str(index) + '''" column="1">
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QPlainTextEdit" name="''' + name + '''">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed"/>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>50</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="set''' + name + '''">
-       <property name="maximumSize">
-        <size>
-         <width>40</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="text">
-        <string notr="true">Set</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-'''
-
-def combobox_ui_bool(name, index):
-    return combobox_ui(name, ["Default", "true", "false"], index)
-
-def in_list(list, type):
-    for element in list:
-        if element["name"] == type:
-            return element;
-    return
-
-create_checks_index = 0
-def create_checks(variables, enums, structs, offset = ""):
-    checks = ""
-    global create_checks_index
-    # create BasedOnStyle combobox ussually not presented in FormatStyle struct
-    if 0 == create_checks_index:
-        create_checks_index += 1
-        checks = lable_ui("BasedOnStyle", create_checks_index)
-        checks += combobox_ui("BasedOnStyle", ["LLVM", "Google", "Chromium", "Mozilla", "WebKit", "Microsoft", "GNU"], create_checks_index)
-
-    for variable in variables:
-        if "doxygen" in variable.keys():
-            if ("**deprecated**" in variable['doxygen']):
-                continue;
-
-        create_checks_index += 1
-        type = variable["type"]
-        name = variable["name"]
-        enum = in_list(enums, type)
-        struct = in_list(structs, type)
-        if enum:
-            checks += lable_ui(name, create_checks_index, offset)
-            checks += combobox_ui(name, [value["name"].split("_")[1] for value in enum["values"]], create_checks_index)
-        elif struct:
-            checks += lable_ui(name, create_checks_index, offset)
-            check = create_checks(struct["properties"]["public"], enums, structs, "  ")
-            checks += check
-        elif "std::string" == type or "unsigned" == type or "int" == type:
-            checks += lable_ui(name, create_checks_index, offset)
-            checks += string_ui(name, create_checks_index)
-        elif "std::vector<std::string >" == type:
-            checks += lable_ui(name, create_checks_index, offset)
-            checks += vector_ui(name, create_checks_index)
-        elif "bool" == type:
-            checks += lable_ui(name, create_checks_index, offset)
-            checks += combobox_ui_bool(name, create_checks_index)
-    return checks
-
-
-def main():
-    arguments = parse_arguments()
-    header = CppHeaderParser.CppHeader(arguments.options_header)
-
-    enums = header.classes["FormatStyle"]["enums"]["public"]
-    structs = header.classes["FormatStyle"]["nested_classes"]
-    variables = header.classes["FormatStyle"]["properties"]["public"]
-
-    checks = create_checks(variables, enums, structs)
-
-    current_path = os.path.dirname(os.path.abspath(__file__))
-    ui_path = os.path.abspath(os.path.join(current_path, '..', 'src',
-        'plugins', 'clangformat', 'clangformatchecks.ui'))
-    with open(ui_path, 'w') as f:
-        f.write(full_ui_content(checks))
-
-
-if __name__ == "__main__":
-    main()
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 39cd6d1acf..9d7fd7f5f5 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;