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
author: Tim Jenßen <tim.jenssen@qt.io> 2023-03-26 15:58:49 +0200
committer: Tim Jenßen <tim.jenssen@qt.io> 2023-03-26 16:26:18 +0200
commit: feabda3aa78b7861ae03f1cc2296e8adf34ba038 (patch)
tree: 9bc06c7eeb6fca92e8cdd273908f7350260a8cb8 /src/tools/qml2puppet
parent: 359ea5d55a9452d70c20754c2380b1bf1c704c04 (diff)
parent: f7639f458a4b87263e96de70f26554a660148bc3 (diff)
download: qt-creator-feabda3aa78b7861ae03f1cc2296e8adf34ba038.tar.gz
184 files changed, 298 insertions, 581 deletions
diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt
index f8d84e3a14..62325819a5 100644
--- a/src/tools/qml2puppet/CMakeLists.txt
+++ b/src/tools/qml2puppet/CMakeLists.txt
@@ -1,40 +1,46 @@
 cmake_minimum_required(VERSION 3.16)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake")
-
+if (NOT QT_CREATOR_API_DEFINED)
+  # standalone build
+  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake")
 
-project(qml2puppet)
+  project(qml2puppet)
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_CXX_EXTENSIONS OFF)
 
-if (NOT QT_CREATOR_API_DEFINED)
-  # standalone build
   set(DESTINATION DESTINATION .)
   include(QtCreatorIDEBranding)
   include(QtCreatorAPI)
+
+  find_package(QT 5.15.0 NAMES Qt6 Qt5
+    COMPONENTS Core REQUIRED
+  )
+  find_package(Qt${QT_VERSION_MAJOR}
+    COMPONENTS Concurrent Core Gui Network PrintSupport Qml Quick Sql Widgets Xml
+    REQUIRED
+  )
+else()
+  # Qt Creator only supports Qt 6
+  set(QT_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
 endif()
 
 configure_file(../../app/app_version.h.cmakein app/app_version.h ESCAPE_QUOTES)
 
-find_package(Qt5
-  COMPONENTS Concurrent Core Gui Network PrintSupport Qml Quick Sql Widgets Xml Core5Compat
-  REQUIRED
-)
-
 if (NOT TARGET QmlPuppetCommunication)
   include(../../libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake)
 endif()
 
 add_qtc_executable(qml2puppet
   ${DESTINATION}
+  CONDITION TARGET Qt::Quick
   DEPENDS
-    Qt5::CorePrivate Qt5::Widgets Qt5::QmlPrivate
-    Qt5::QuickPrivate Qt5::Network Qt5::GuiPrivate
+    Qt::CorePrivate Qt::Widgets Qt::QmlPrivate
+    Qt::QuickPrivate Qt::Network Qt::GuiPrivate
     QmlPuppetCommunication
   INCLUDES
     ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
@@ -43,27 +49,29 @@ add_qtc_executable(qml2puppet
     qml2puppet/qmlbase.h qml2puppet/appmetadata.h
     qml2puppet/qmlpuppet.h qml2puppet/qmlpuppet.cpp qml2puppet/configcrashpad.h
     qmlpuppet.qrc
+  PROPERTIES
+    OUTPUT_NAME qml2puppet-${IDE_VERSION}
 )
 
-set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-${IDE_VERSION})
-
-execute_process(
-    COMMAND git describe --tags --always --dirty=+
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    RESULT_VARIABLE GIT_SHA_RESULT
-    OUTPUT_VARIABLE GIT_SHA_OUTPUT
-    ERROR_VARIABLE GIT_SHA_ERROR
-)
-
-#if we are not a git repository use the .tag file
-if(NOT GIT_SHA_OUTPUT)
-    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../../../.tag GIT_SHA_OUTPUT)
+if(TARGET qml2puppet)
+  execute_process(
+      COMMAND git describe --tags --always --dirty=+
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      RESULT_VARIABLE GIT_SHA_RESULT
+      OUTPUT_VARIABLE GIT_SHA_OUTPUT
+      ERROR_VARIABLE GIT_SHA_ERROR
+  )
+
+  #if we are not a git repository use the .tag file
+  if(NOT GIT_SHA_OUTPUT)
+      file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../../../.tag GIT_SHA_OUTPUT)
+  endif()
+
+  add_definitions( -D GIT_SHA=${GIT_SHA_OUTPUT} )
 endif()
 
-add_definitions( -D GIT_SHA=${GIT_SHA_OUTPUT} )
-
 extend_qtc_executable(qml2puppet
-  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0
+  CONDITION Qt6_VERSION
   SOURCES
     editor3d_qt6.qrc
 )
@@ -85,11 +93,11 @@ extend_qtc_executable(qml2puppet
     nodeinstanceclientproxy.cpp nodeinstanceclientproxy.h
 )
 
-find_package(Qt5 5.15.0 COMPONENTS Quick3D QUIET)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick3D QUIET)
 extend_qtc_executable(qml2puppet
-  CONDITION TARGET Qt5::Quick3D
+  CONDITION TARGET Qt::Quick3D
   FEATURE_INFO "Qt Quick 3D support"
-  DEPENDS Qt5::Quick3D Qt5::Quick3DPrivate
+  DEPENDS Qt::Quick3D Qt::Quick3DPrivate
   DEFINES QUICK3D_MODULE
 
   SOURCES_PREFIX qml2puppet/editor3d
@@ -105,33 +113,33 @@ extend_qtc_executable(qml2puppet
     icongizmoimageprovider.cpp icongizmoimageprovider.h
 )
 
-find_package(Qt5 5.15.0 COMPONENTS Quick3DAssetImport QUIET)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick3DAssetImport QUIET)
 extend_qtc_executable(qml2puppet
-  CONDITION TARGET Qt5::Quick3DAssetImport
+  CONDITION TARGET Qt::Quick3DAssetImport
   FEATURE_INFO "Qt Quick 3D asset import"
-  DEPENDS Qt5::Quick3DAssetImportPrivate
+  DEPENDS Qt::Quick3DAssetImportPrivate
   DEFINES IMPORT_QUICK3D_ASSETS
 )
 
-find_package(Qt5 5.15.0 COMPONENTS Quick3DParticles QUIET)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick3DParticles QUIET)
 extend_qtc_executable(qml2puppet
-  CONDITION TARGET Qt5::Quick3DParticles
+  CONDITION TARGET Qt::Quick3DParticles
   FEATURE_INFO "Qt Quick 3D particles"
-  DEPENDS Qt5::Quick3DParticles Qt5::Quick3DParticlesPrivate
+  DEPENDS Qt::Quick3DParticles Qt::Quick3DParticlesPrivate
   DEFINES QUICK3D_PARTICLES_MODULE
 )
 
 # Quick3DAssetUtils optionally depends on QuickTimeline, so find also it to make the CI build work
-find_package(Qt5 5.15.0 COMPONENTS Quick3DAssetUtils QuickTimeline QUIET)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Quick3DAssetUtils QuickTimeline QUIET)
 extend_qtc_executable(qml2puppet
-  CONDITION TARGET Qt5::Quick3DAssetUtils
+  CONDITION TARGET Qt::Quick3DAssetUtils
   FEATURE_INFO "Qt Quick 3D asset utils"
-  DEPENDS Qt5::Quick3DAssetUtilsPrivate
+  DEPENDS Qt::Quick3DAssetUtilsPrivate
   DEFINES QUICK3D_ASSET_UTILS_MODULE
 )
 
 extend_qtc_executable(qml2puppet
-  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0
+  CONDITION Qt6_VERSION
   SOURCES_PREFIX qml2puppet/editor3d/qt5compat
   SOURCES
     qquick3darealight.cpp qquick3darealight_p.h
@@ -212,7 +220,7 @@ extend_qtc_executable(qml2puppet
   DEPENDS Nanotrace
 )
 
-if (Qt5_VERSION VERSION_GREATER_EQUAL 6.4.0)
+if (Qt6_VERSION VERSION_GREATER_EQUAL 6.4.0)
     extend_qtc_executable(qml2puppet
       # QT_QML_DEBUG is disabled in release builds, but is necessary to have the preview debug channel
       DEFINES ENABLE_INTERNAL_QML_RUNTIME QT_QML_DEBUG
diff --git a/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp
index 37e914451c..ffafb7bb00 100644
--- a/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp
+++ b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.cpp
@@ -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
 
 #include "nodeinstanceclientproxy.h"
 
diff --git a/src/tools/qml2puppet/instances/nodeinstanceclientproxy.h b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.h
index 046117887e..8015dd0192 100644
--- a/src/tools/qml2puppet/instances/nodeinstanceclientproxy.h
+++ b/src/tools/qml2puppet/instances/nodeinstanceclientproxy.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/mockfiles/Dialog.qml b/src/tools/qml2puppet/mockfiles/Dialog.qml
index e6a3ced517..da29c9926f 100644
--- a/src/tools/qml2puppet/mockfiles/Dialog.qml
+++ b/src/tools/qml2puppet/mockfiles/Dialog.qml
@@ -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 QtQuick 2.1
 
diff --git a/src/tools/qml2puppet/mockfiles/SwipeView.qml b/src/tools/qml2puppet/mockfiles/SwipeView.qml
index 751cdf2683..f8287accb4 100644
--- a/src/tools/qml2puppet/mockfiles/SwipeView.qml
+++ b/src/tools/qml2puppet/mockfiles/SwipeView.qml
@@ -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 QtQuick 2.6
 import QtQuick.Layouts 1.3
diff --git a/src/tools/qml2puppet/mockfiles/ToggleButton.qml b/src/tools/qml2puppet/mockfiles/ToggleButton.qml
index 3c042b0e98..41420cc3db 100644
--- a/src/tools/qml2puppet/mockfiles/ToggleButton.qml
+++ b/src/tools/qml2puppet/mockfiles/ToggleButton.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.12
 import QtQuick 2.0
diff --git a/src/tools/qml2puppet/mockfiles/ToolBarButton.qml b/src/tools/qml2puppet/mockfiles/ToolBarButton.qml
index c149c10b47..1e74b85c0d 100644
--- a/src/tools/qml2puppet/mockfiles/ToolBarButton.qml
+++ b/src/tools/qml2puppet/mockfiles/ToolBarButton.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.12
 import QtQuick 2.0
diff --git a/src/tools/qml2puppet/mockfiles/Window.qml b/src/tools/qml2puppet/mockfiles/Window.qml
index 7dd8610499..96b32338f8 100644
--- a/src/tools/qml2puppet/mockfiles/Window.qml
+++ b/src/tools/qml2puppet/mockfiles/Window.qml
@@ -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 QtQuick 2.1
 
diff --git a/src/tools/qml2puppet/mockfiles/qt5/AdjustableArrow.qml b/src/tools/qml2puppet/mockfiles/qt5/AdjustableArrow.qml
index 2b0da44784..9e1880643a 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/AdjustableArrow.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/AdjustableArrow.qml
@@ -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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/AreaLightHandle.qml b/src/tools/qml2puppet/mockfiles/qt5/AreaLightHandle.qml
index b3b0dbbc8c..be29721aa4 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/AreaLightHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/AreaLightHandle.qml
@@ -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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/Arrow.qml b/src/tools/qml2puppet/mockfiles/qt5/Arrow.qml
index 98d3abe112..a77f7321e4 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/Arrow.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/Arrow.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/AutoScaleHelper.qml b/src/tools/qml2puppet/mockfiles/qt5/AutoScaleHelper.qml
index 9f33abaddd..7beb6226c3 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/AutoScaleHelper.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/AutoScaleHelper.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/AxisHelper.qml b/src/tools/qml2puppet/mockfiles/qt5/AxisHelper.qml
index de45ff39f5..054fd9f0ba 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/AxisHelper.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/AxisHelper.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/AxisHelperArm.qml b/src/tools/qml2puppet/mockfiles/qt5/AxisHelperArm.qml
index 9385c9e736..36bc0a360e 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/AxisHelperArm.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/AxisHelperArm.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/CameraFrustum.qml b/src/tools/qml2puppet/mockfiles/qt5/CameraFrustum.qml
index ad581417cb..22cf9d3c03 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/CameraFrustum.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/CameraFrustum.qml
@@ -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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/CameraGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/CameraGizmo.qml
index b1cdbcd89a..510dcc5ece 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/CameraGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/CameraGizmo.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/DirectionalDraggable.qml b/src/tools/qml2puppet/mockfiles/qt5/DirectionalDraggable.qml
index a9f3b8ae55..8cb9d176e2 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/DirectionalDraggable.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/DirectionalDraggable.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/EditCameraController.qml b/src/tools/qml2puppet/mockfiles/qt5/EditCameraController.qml
index 5a5796b96b..eb493f6b10 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/EditCameraController.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/EditCameraController.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.12
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/EditView3D.qml b/src/tools/qml2puppet/mockfiles/qt5/EditView3D.qml
index 8c69212c95..bc8ef4e46b 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/EditView3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/EditView3D.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.12
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/FadeHandle.qml b/src/tools/qml2puppet/mockfiles/qt5/FadeHandle.qml
index 9ca007057a..d400133192 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/FadeHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/FadeHandle.qml
@@ -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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/HelperGrid.qml b/src/tools/qml2puppet/mockfiles/qt5/HelperGrid.qml
index eef82d4612..8b6e3b1b98 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/HelperGrid.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/HelperGrid.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/IconGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/IconGizmo.qml
index e44cf74d08..d2da8cfdef 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/IconGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/IconGizmo.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/IconRenderer3D.qml b/src/tools/qml2puppet/mockfiles/qt5/IconRenderer3D.qml
index 2f64dd93c0..acda5d5ef2 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/IconRenderer3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/IconRenderer3D.qml
@@ -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
 
 import QtQuick 2.15
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/LightGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/LightGizmo.qml
index a20d75120c..fe5727a83c 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/LightGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/LightGizmo.qml
@@ -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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/LightIconGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/LightIconGizmo.qml
index 57144df31e..dd02cf30fb 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/LightIconGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/LightIconGizmo.qml
@@ -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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/LightModel.qml b/src/tools/qml2puppet/mockfiles/qt5/LightModel.qml
index 081a2a2e4d..4d256cebf8 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/LightModel.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/LightModel.qml
@@ -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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/Line3D.qml b/src/tools/qml2puppet/mockfiles/qt5/Line3D.qml
index 3b2f5141f2..4bab4be315 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/Line3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/Line3D.qml
@@ -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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/MaterialNodeView.qml b/src/tools/qml2puppet/mockfiles/qt5/MaterialNodeView.qml
index f347253c80..2a65838d0c 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/MaterialNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/MaterialNodeView.qml
@@ -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
 
 import QtQuick3D 1.15
 
diff --git a/src/tools/qml2puppet/mockfiles/qt5/ModelNode2DImageView.qml b/src/tools/qml2puppet/mockfiles/qt5/ModelNode2DImageView.qml
index a1714e87c9..9c9e88e3b6 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/ModelNode2DImageView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/ModelNode2DImageView.qml
@@ -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
 
 import QtQuick 2.15
 
diff --git a/src/tools/qml2puppet/mockfiles/qt5/ModelNode3DImageView.qml b/src/tools/qml2puppet/mockfiles/qt5/ModelNode3DImageView.qml
index 0e460621a1..12ae640251 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/ModelNode3DImageView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/ModelNode3DImageView.qml
@@ -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
 
 import QtQuick 2.15
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/ModelNodeView.qml b/src/tools/qml2puppet/mockfiles/qt5/ModelNodeView.qml
index aaf725129f..f1d4ebfe04 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/ModelNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/ModelNodeView.qml
@@ -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
 
 import QtQuick 2.15
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/MoveGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/MoveGizmo.qml
index 76e57cccdb..d2c3dc7d5d 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/MoveGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/MoveGizmo.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/NodeNodeView.qml b/src/tools/qml2puppet/mockfiles/qt5/NodeNodeView.qml
index 533af52c39..279913576b 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/NodeNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/NodeNodeView.qml
@@ -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
 
 import QtQuick 2.15
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/Overlay2D.qml b/src/tools/qml2puppet/mockfiles/qt5/Overlay2D.qml
index ef59a7717c..3ec2959394 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/Overlay2D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/Overlay2D.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/PlanarDraggable.qml b/src/tools/qml2puppet/mockfiles/qt5/PlanarDraggable.qml
index 1ae75b2e81..8efc4445ed 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/PlanarDraggable.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/PlanarDraggable.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/PlanarMoveHandle.qml b/src/tools/qml2puppet/mockfiles/qt5/PlanarMoveHandle.qml
index cb4ba367bc..451c8220c8 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/PlanarMoveHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/PlanarMoveHandle.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/PlanarScaleHandle.qml b/src/tools/qml2puppet/mockfiles/qt5/PlanarScaleHandle.qml
index 3dd315989a..77ed5603a8 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/PlanarScaleHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/PlanarScaleHandle.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/RotateGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/RotateGizmo.qml
index b0457c4a97..0130bacb53 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/RotateGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/RotateGizmo.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/RotateRing.qml b/src/tools/qml2puppet/mockfiles/qt5/RotateRing.qml
index 2f898e0d8a..3fe92413f7 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/RotateRing.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/RotateRing.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/ScaleGizmo.qml b/src/tools/qml2puppet/mockfiles/qt5/ScaleGizmo.qml
index cafb0088e3..b0fe1d1b47 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/ScaleGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/ScaleGizmo.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/ScaleRod.qml b/src/tools/qml2puppet/mockfiles/qt5/ScaleRod.qml
index f13aee9706..07675d3a7d 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/ScaleRod.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/ScaleRod.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/SceneView3D.qml b/src/tools/qml2puppet/mockfiles/qt5/SceneView3D.qml
index 103c787f8e..cfd565c6cb 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/SceneView3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/SceneView3D.qml
@@ -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
 
 import QtQuick3D 1.15
 
diff --git a/src/tools/qml2puppet/mockfiles/qt5/SelectionBox.qml b/src/tools/qml2puppet/mockfiles/qt5/SelectionBox.qml
index 9fe071d91a..0044888bfe 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/SelectionBox.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/SelectionBox.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt5/SpotLightHandle.qml b/src/tools/qml2puppet/mockfiles/qt5/SpotLightHandle.qml
index 95e486c5f4..f8974207c0 100644
--- a/src/tools/qml2puppet/mockfiles/qt5/SpotLightHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt5/SpotLightHandle.qml
@@ -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
 
 import QtQuick 2.0
 import QtQuick3D 1.15
diff --git a/src/tools/qml2puppet/mockfiles/qt6/AdjustableArrow.qml b/src/tools/qml2puppet/mockfiles/qt6/AdjustableArrow.qml
index 164c0a8404..cffc674c74 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/AdjustableArrow.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/AdjustableArrow.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/AreaLightHandle.qml b/src/tools/qml2puppet/mockfiles/qt6/AreaLightHandle.qml
index 80117b84e4..26ad41d19f 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/AreaLightHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/AreaLightHandle.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/Arrow.qml b/src/tools/qml2puppet/mockfiles/qt6/Arrow.qml
index cfa01df830..59ac5a5f08 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/Arrow.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/Arrow.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/AutoScaleHelper.qml b/src/tools/qml2puppet/mockfiles/qt6/AutoScaleHelper.qml
index 08a2082575..5c73716426 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/AutoScaleHelper.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/AutoScaleHelper.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/AxisHelper.qml b/src/tools/qml2puppet/mockfiles/qt6/AxisHelper.qml
index fc2951c732..ea44acc1ec 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/AxisHelper.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/AxisHelper.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/AxisHelperArm.qml b/src/tools/qml2puppet/mockfiles/qt6/AxisHelperArm.qml
index f8f6e19692..683075c4c7 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/AxisHelperArm.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/AxisHelperArm.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/CameraFrustum.qml b/src/tools/qml2puppet/mockfiles/qt6/CameraFrustum.qml
index b7b536477b..0e1a8599b4 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/CameraFrustum.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/CameraFrustum.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/CameraGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/CameraGizmo.qml
index 21195cfadd..39f3066c3b 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/CameraGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/CameraGizmo.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/DirectionalDraggable.qml b/src/tools/qml2puppet/mockfiles/qt6/DirectionalDraggable.qml
index be4997a3d5..85eb02b78a 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/DirectionalDraggable.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/DirectionalDraggable.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml b/src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml
index aa15aedb29..42712d56a5 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/EditCameraController.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/EditView3D.qml b/src/tools/qml2puppet/mockfiles/qt6/EditView3D.qml
index 7f7b148460..fad4ae822f 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/EditView3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/EditView3D.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/FadeHandle.qml b/src/tools/qml2puppet/mockfiles/qt6/FadeHandle.qml
index 9a3e9c4438..b158b347d1 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/FadeHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/FadeHandle.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/HelperGrid.qml b/src/tools/qml2puppet/mockfiles/qt6/HelperGrid.qml
index c76490dfe7..399f116cb0 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/HelperGrid.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/HelperGrid.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/IconGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/IconGizmo.qml
index 70ee9d51f1..acde896aeb 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/IconGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/IconGizmo.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/LightGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/LightGizmo.qml
index e8a25bb39d..9a65ac9c75 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/LightGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/LightGizmo.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/LightIconGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/LightIconGizmo.qml
index b4d7abbb6a..542482469e 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/LightIconGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/LightIconGizmo.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/LightModel.qml b/src/tools/qml2puppet/mockfiles/qt6/LightModel.qml
index 3208c2211a..e6d67a794c 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/LightModel.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/LightModel.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/Line3D.qml b/src/tools/qml2puppet/mockfiles/qt6/Line3D.qml
index df29d0990d..c65b0feb0a 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/Line3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/Line3D.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/MaterialNodeView.qml b/src/tools/qml2puppet/mockfiles/qt6/MaterialNodeView.qml
index 9fd74b55dd..13d185b7d9 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/MaterialNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/MaterialNodeView.qml
@@ -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
 
 import QtQuick3D 6.0
 
diff --git a/src/tools/qml2puppet/mockfiles/qt6/ModelNode2DImageView.qml b/src/tools/qml2puppet/mockfiles/qt6/ModelNode2DImageView.qml
index bf95be9c82..c416c1e16f 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/ModelNode2DImageView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ModelNode2DImageView.qml
@@ -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
 
 import QtQuick 6.0
 
diff --git a/src/tools/qml2puppet/mockfiles/qt6/ModelNode3DImageView.qml b/src/tools/qml2puppet/mockfiles/qt6/ModelNode3DImageView.qml
index 3eaed5c210..ddb1c4cb44 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/ModelNode3DImageView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ModelNode3DImageView.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/ModelNodeView.qml b/src/tools/qml2puppet/mockfiles/qt6/ModelNodeView.qml
index 7ae513d27a..6d6ad3c011 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/ModelNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ModelNodeView.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/MoveGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/MoveGizmo.qml
index 6f10038d1b..fc6e0b6fa4 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/MoveGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/MoveGizmo.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/NodeNodeView.qml b/src/tools/qml2puppet/mockfiles/qt6/NodeNodeView.qml
index 242d9cf0b9..07c2b03e0f 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/NodeNodeView.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/NodeNodeView.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/Overlay2D.qml b/src/tools/qml2puppet/mockfiles/qt6/Overlay2D.qml
index e2573bed66..affbb8f25c 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/Overlay2D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/Overlay2D.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/ParticleEmitterGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/ParticleEmitterGizmo.qml
index 829556ecb2..17e5123c10 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/ParticleEmitterGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ParticleEmitterGizmo.qml
@@ -1,5 +1,5 @@
 // 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 QtQuick
 import QtQuick3D
diff --git a/src/tools/qml2puppet/mockfiles/qt6/ParticleSystemGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/ParticleSystemGizmo.qml
index 153db46680..db13c0f7d7 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/ParticleSystemGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ParticleSystemGizmo.qml
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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 QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/PlanarDraggable.qml b/src/tools/qml2puppet/mockfiles/qt6/PlanarDraggable.qml
index bc11445cf0..e1410b84fe 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/PlanarDraggable.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/PlanarDraggable.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/PlanarMoveHandle.qml b/src/tools/qml2puppet/mockfiles/qt6/PlanarMoveHandle.qml
index c2969f1ab1..6193ec4b8f 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/PlanarMoveHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/PlanarMoveHandle.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/PlanarScaleHandle.qml b/src/tools/qml2puppet/mockfiles/qt6/PlanarScaleHandle.qml
index 916640b230..28c1181b9a 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/PlanarScaleHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/PlanarScaleHandle.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/RotateGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/RotateGizmo.qml
index 0e40045bb2..fa851d6fb7 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/RotateGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/RotateGizmo.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/RotateRing.qml b/src/tools/qml2puppet/mockfiles/qt6/RotateRing.qml
index 9c0d49ed82..eac1b0b46c 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/RotateRing.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/RotateRing.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/ScaleGizmo.qml b/src/tools/qml2puppet/mockfiles/qt6/ScaleGizmo.qml
index 6335e7707c..225c4e6643 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/ScaleGizmo.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ScaleGizmo.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/ScaleRod.qml b/src/tools/qml2puppet/mockfiles/qt6/ScaleRod.qml
index 2c6cf64997..23e9e5bcd8 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/ScaleRod.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/ScaleRod.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/SceneView3D.qml b/src/tools/qml2puppet/mockfiles/qt6/SceneView3D.qml
index 3fd0417b27..9f3e25d44a 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/SceneView3D.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/SceneView3D.qml
@@ -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
 
 import QtQuick3D 6.0
 
diff --git a/src/tools/qml2puppet/mockfiles/qt6/SelectionBox.qml b/src/tools/qml2puppet/mockfiles/qt6/SelectionBox.qml
index d365387052..f300fd9502 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/SelectionBox.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/SelectionBox.qml
@@ -1,5 +1,5 @@
 // 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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/mockfiles/qt6/SpotLightHandle.qml b/src/tools/qml2puppet/mockfiles/qt6/SpotLightHandle.qml
index def0a5b4fc..09ecbfceda 100644
--- a/src/tools/qml2puppet/mockfiles/qt6/SpotLightHandle.qml
+++ b/src/tools/qml2puppet/mockfiles/qt6/SpotLightHandle.qml
@@ -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
 
 import QtQuick 6.0
 import QtQuick3D 6.0
diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs
index dab100a382..ac38bf1818 100644
--- a/src/tools/qml2puppet/qml2puppet.qbs
+++ b/src/tools/qml2puppet/qml2puppet.qbs
@@ -1,309 +1,4 @@
-import qbs.Utilities
-import QtcFunctions
-
-QtcTool {
+Product {
     name: "qml2puppet"
-    installDir: qbs.targetOS.contains("macos")
-                ? qtc.ide_libexec_path + "/qmldesigner" : qtc.ide_libexec_path
-
-    Depends { name: "Nanotrace"; required: false }
-    Depends { name: "Utils" }
-    Depends { name: "bundle" }
-    Depends {
-        name: "Qt"
-        submodules: [
-            "core-private", "gui-private", "network", "qml-private", "quick", "quick-private",
-            "widgets"
-        ]
-    }
-    Depends { name: "Qt.quick3d-private"; required: false }
-    Depends { name: "Qt.quick3dparticles-private"; required: false }
-
-    property bool useQuick3d: Utilities.versionCompare(Qt.core.version, "5.15") >= 0
-                              && Qt["quick3d-private"].present
-    property bool useParticle3d: Utilities.versionCompare(Qt.core.version, "6.2") >= 0
-                              && Qt["quick3dparticles-private"].present
-
-    cpp.defines: {
-        var defines = base.filter(function(d) { return d != "QT_CREATOR"; });
-        if (useQuick3d)
-            defines.push("QUICK3D_MODULE");
-        if (useParticle3d)
-            defines.push("QUICK3D_PARTICLES_MODULE");
-        return defines;
-    }
-    Properties {
-        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd")
-        cpp.dynamicLibraries: base.concat("rt")
-    }
-    Properties {
-        condition: qbs.targetOS.contains("darwin")
-        bundle.embedInfoPlist: true
-    }
-
-    property path puppetDir: "../../../share/qtcreator/qml/qmlpuppet"
-    cpp.includePaths: base.concat([
-        puppetDir + "/commands",
-        puppetDir + "/container",
-        puppetDir + "/instances",
-        puppetDir + "/interfaces",
-        puppetDir + "/types",
-        puppetDir + "/qml2puppet/instances",
-        puppetDir + "/qmlprivategate",
-    ])
-
-    // TODO: Put into static lib and share with qmldesigner
-    Group {
-        name: "puppet sources"
-        prefix: puppetDir + '/'
-        files: [
-            "commands/changeauxiliarycommand.cpp",
-            "commands/changeauxiliarycommand.h",
-            "commands/changebindingscommand.cpp",
-            "commands/changebindingscommand.h",
-            "commands/changefileurlcommand.cpp",
-            "commands/changefileurlcommand.h",
-            "commands/changeidscommand.cpp",
-            "commands/changeidscommand.h",
-            "commands/changenodesourcecommand.cpp",
-            "commands/changenodesourcecommand.h",
-            "commands/changestatecommand.cpp",
-            "commands/changestatecommand.h",
-            "commands/changevaluescommand.cpp",
-            "commands/changevaluescommand.h",
-            "commands/childrenchangedcommand.cpp",
-            "commands/childrenchangedcommand.h",
-            "commands/clearscenecommand.cpp",
-            "commands/clearscenecommand.h",
-            "commands/completecomponentcommand.cpp",
-            "commands/completecomponentcommand.h",
-            "commands/componentcompletedcommand.cpp",
-            "commands/componentcompletedcommand.h",
-            "commands/createinstancescommand.cpp",
-            "commands/createinstancescommand.h",
-            "commands/createscenecommand.cpp",
-            "commands/createscenecommand.h",
-            "commands/debugoutputcommand.cpp",
-            "commands/debugoutputcommand.h",
-            "commands/endpuppetcommand.cpp",
-            "commands/endpuppetcommand.h",
-            "commands/informationchangedcommand.cpp",
-            "commands/informationchangedcommand.h",
-            "commands/nanotracecommand.cpp",
-            "commands/nanotracecommand.h",
-            "commands/pixmapchangedcommand.cpp",
-            "commands/pixmapchangedcommand.h",
-            "commands/puppetalivecommand.cpp",
-            "commands/puppetalivecommand.h",
-            "commands/removeinstancescommand.cpp",
-            "commands/removeinstancescommand.h",
-            "commands/removepropertiescommand.cpp",
-            "commands/removepropertiescommand.h",
-            "commands/removesharedmemorycommand.cpp",
-            "commands/removesharedmemorycommand.h",
-            "commands/reparentinstancescommand.cpp",
-            "commands/reparentinstancescommand.h",
-            "commands/statepreviewimagechangedcommand.cpp",
-            "commands/statepreviewimagechangedcommand.h",
-            "commands/synchronizecommand.h",
-            "commands/changepreviewimagesizecommand.cpp",
-            "commands/changepreviewimagesizecommand.h",
-            "commands/changelanguagecommand.cpp",
-            "commands/changelanguagecommand.h",
-            "commands/tokencommand.cpp",
-            "commands/tokencommand.h",
-            "commands/valueschangedcommand.cpp",
-            "commands/valueschangedcommand.h",
-            "commands/changeselectioncommand.cpp",
-            "commands/changeselectioncommand.h",
-            "commands/update3dviewstatecommand.cpp",
-            "commands/update3dviewstatecommand.h",
-            "commands/puppettocreatorcommand.cpp",
-            "commands/puppettocreatorcommand.h",
-            "commands/inputeventcommand.cpp",
-            "commands/inputeventcommand.h",
-            "commands/view3dactioncommand.cpp",
-            "commands/view3dactioncommand.h",
-            "commands/requestmodelnodepreviewimagecommand.cpp",
-            "commands/requestmodelnodepreviewimagecommand.h",
-            "commands/captureddatacommand.h",
-            "commands/scenecreatedcommand.h",
-            "container/addimportcontainer.cpp",
-            "container/addimportcontainer.h",
-            "container/idcontainer.cpp",
-            "container/idcontainer.h",
-            "container/imagecontainer.cpp",
-            "container/imagecontainer.h",
-            "container/informationcontainer.cpp",
-            "container/informationcontainer.h",
-            "container/instancecontainer.cpp",
-            "container/instancecontainer.h",
-            "container/mockuptypecontainer.cpp",
-            "container/mockuptypecontainer.h",
-            "container/propertyabstractcontainer.cpp",
-            "container/propertyabstractcontainer.h",
-            "container/propertybindingcontainer.cpp",
-            "container/propertybindingcontainer.h",
-            "container/propertyvaluecontainer.cpp",
-            "container/propertyvaluecontainer.h",
-            "container/reparentcontainer.cpp",
-            "container/reparentcontainer.h",
-            "container/sharedmemory.h",
-            "instances/nodeinstanceclientproxy.cpp",
-            "instances/nodeinstanceclientproxy.h",
-            "interfaces/commondefines.h",
-            "interfaces/nodeinstanceclientinterface.h",
-            "interfaces/nodeinstanceserverinterface.cpp",
-            "interfaces/nodeinstanceserverinterface.h",
-            "qmlprivategate/qmlprivategate.h",
-            "types/enumeration.h",
-        ]
-    }
-
-    Group {
-        name: "SharedMemory (Unix)"
-        condition: qbs.targetOS.contains("unix")
-        prefix: puppetDir + "/container/"
-        files: ["sharedmemory_unix.cpp"]
-    }
-
-    Group {
-        name: "SharedMemory (Generic)"
-        condition: !qbs.targetOS.contains("unix")
-        prefix: puppetDir + "/container/"
-        files: ["sharedmemory_qt.cpp"]
-    }
-
-    Group {
-        name: "puppet2 3D editor Qt6"
-        prefix: puppetDir + "/"
-        files: ["editor3d_qt6.qrc"]
-    }
-
-    Group {
-        name: "puppet2 sources"
-        prefix: puppetDir + "/qml2puppet/"
-        files: [
-            "../qmlpuppet.qrc",
-            "Info.plist",
-            "instances/anchorchangesnodeinstance.cpp",
-            "instances/anchorchangesnodeinstance.h",
-            "instances/behaviornodeinstance.cpp",
-            "instances/behaviornodeinstance.h",
-            "instances/childrenchangeeventfilter.cpp",
-            "instances/childrenchangeeventfilter.h",
-            "instances/componentnodeinstance.cpp",
-            "instances/componentnodeinstance.h",
-            "instances/dummycontextobject.cpp",
-            "instances/dummycontextobject.h",
-            "instances/dummynodeinstance.cpp",
-            "instances/dummynodeinstance.h",
-            "instances/layoutnodeinstance.cpp",
-            "instances/layoutnodeinstance.h",
-            "instances/nodeinstanceserver.cpp",
-            "instances/nodeinstanceserver.h",
-            "instances/nodeinstancesignalspy.cpp",
-            "instances/nodeinstancesignalspy.h",
-            "instances/objectnodeinstance.cpp",
-            "instances/objectnodeinstance.h",
-            "instances/positionernodeinstance.cpp",
-            "instances/positionernodeinstance.h",
-            "instances/quickitemnodeinstance.cpp",
-            "instances/quickitemnodeinstance.h",
-            "instances/qmlpropertychangesnodeinstance.cpp",
-            "instances/qmlpropertychangesnodeinstance.h",
-            "instances/qmlstatenodeinstance.cpp",
-            "instances/qmlstatenodeinstance.h",
-            "instances/quick3dmaterialnodeinstance.cpp",
-            "instances/quick3dmaterialnodeinstance.h",
-            "instances/quick3dnodeinstance.cpp",
-            "instances/quick3dnodeinstance.h",
-            "instances/quick3drenderablenodeinstance.cpp",
-            "instances/quick3drenderablenodeinstance.h",
-            "instances/quick3dtexturenodeinstance.cpp",
-            "instances/quick3dtexturenodeinstance.h",
-            "instances/qmltransitionnodeinstance.cpp",
-            "instances/qmltransitionnodeinstance.h",
-            "instances/qt3dpresentationnodeinstance.cpp",
-            "instances/qt3dpresentationnodeinstance.h",
-            "instances/qt5informationnodeinstanceserver.cpp",
-            "instances/qt5informationnodeinstanceserver.h",
-            "instances/qt5nodeinstanceclientproxy.cpp",
-            "instances/qt5nodeinstanceclientproxy.h",
-            "instances/qt5nodeinstanceserver.cpp",
-            "instances/qt5nodeinstanceserver.h",
-            "instances/qt5previewnodeinstanceserver.cpp",
-            "instances/qt5previewnodeinstanceserver.h",
-            "instances/qt5rendernodeinstanceserver.cpp",
-            "instances/qt5rendernodeinstanceserver.h",
-            "instances/qt5testnodeinstanceserver.cpp",
-            "instances/qt5testnodeinstanceserver.h",
-            "instances/servernodeinstance.cpp",
-            "instances/servernodeinstance.h",
-            "instances/qt5capturepreviewnodeinstanceserver.cpp",
-            "instances/qt5capturepreviewnodeinstanceserver.h",
-            "instances/qt5captureimagenodeinstanceserver.cpp",
-            "instances/qt5captureimagenodeinstanceserver.h",
-            "instances/nodeinstanceserverdispatcher.cpp",
-            "instances/nodeinstanceserverdispatcher.h",
-            "instances/capturenodeinstanceserverdispatcher.cpp",
-            "instances/capturenodeinstanceserverdispatcher.h",
-            "instances/viewconfig.cpp",
-            "instances/viewconfig.h",
-            "instances/animationdriver.cpp",
-            "instances/animationdriver.h",
-            "editor3d/generalhelper.cpp",
-            "editor3d/mousearea3d.cpp",
-            "editor3d/geometrybase.cpp",
-            "editor3d/camerageometry.cpp",
-            "editor3d/lightgeometry.cpp",
-            "editor3d/gridgeometry.cpp",
-            "editor3d/selectionboxgeometry.cpp",
-            "editor3d/linegeometry.cpp",
-            "editor3d/icongizmoimageprovider.cpp",
-            "editor3d/icongizmoimageprovider.h",
-            "iconrenderer/iconrenderer.cpp",
-            "iconrenderer/iconrenderer.h",
-            "import3d/import3d.cpp",
-            "import3d/import3d.h",
-            "qml2puppetmain.cpp",
-        ]
-
-        Group {
-            name: "3d-only puppet2 headers"
-            files: [
-                "editor3d/geometrybase.h",
-                "editor3d/camerageometry.h",
-                "editor3d/generalhelper.h",
-                "editor3d/gridgeometry.h",
-                "editor3d/lightgeometry.h",
-                "editor3d/linegeometry.h",
-                "editor3d/selectionboxgeometry.h",
-                "editor3d/mousearea3d.h",
-            ]
-            fileTags: product.useQuick3d ? [] : ["unmocable"]
-            overrideTags: false
-        }
-
-        Group {
-            name: "puppet2 Qt 5 compatibility sources"
-            files: ["editor3d/qt5compat/qquick3darealight.cpp"]
-        }
-
-        Group {
-            name: "puppet2 Qt 5 compatibility headers"
-            files: ["editor3d/qt5compat/qquick3darealight_p.h"]
-            fileTags: product.useQuick3d ? [] : ["unmocable"]
-            overrideTags: false
-        }
-    }
-
-    Group {
-        name: "qmlprivategate (new)"
-        condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.6.0")
-        prefix: puppetDir + "/qmlprivategate/"
-        files: [
-            "qmlprivategate.cpp",
-        ]
-    }
+    files: ["*", "**/*"]
 }
diff --git a/src/tools/qml2puppet/qml2puppet/appmetadata.h b/src/tools/qml2puppet/qml2puppet/appmetadata.h
index 7f11276e61..d134135fd8 100644
--- a/src/tools/qml2puppet/qml2puppet/appmetadata.h
+++ b/src/tools/qml2puppet/qml2puppet/appmetadata.h
@@ -1,6 +1,5 @@
 // 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
 #pragma once
 
 #include <QCommandLineParser>
diff --git a/src/tools/qml2puppet/qml2puppet/configcrashpad.h b/src/tools/qml2puppet/qml2puppet/configcrashpad.h
index d6ecc8af4f..af82ffca16 100644
--- a/src/tools/qml2puppet/qml2puppet/configcrashpad.h
+++ b/src/tools/qml2puppet/qml2puppet/configcrashpad.h
@@ -1,5 +1,5 @@
 // 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
 #pragma once
 
 #include <QtGlobal>
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.cpp
index b551617e09..9d5f7221b4 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #ifdef QUICK3D_MODULE
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.h b/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.h
index 9b4ec924fc..d161d8a1aa 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/camerageometry.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
index 7109bddae0..829a6f0edb 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
@@ -1,5 +1,5 @@
 // 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
 #include "generalhelper.h"
 
 #ifdef QUICK3D_MODULE
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h
index 402cd94a3c..089ebf1491 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.cpp
index 4e09944739..8d049d4fb3 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
 
 #ifdef QUICK3D_MODULE
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.h b/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.h
index a50009b0c8..4b26698fe1 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/geometrybase.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.cpp
index 6bbe236544..1ef951ca3b 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #ifdef QUICK3D_MODULE
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.h b/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.h
index 6df03a38ef..9582445e07 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/gridgeometry.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.cpp
index 9f045ebe40..c58e1b85ef 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.cpp
@@ -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
 
 #include "icongizmoimageprovider.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.h b/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.h
index 4cc9ee3795..fa5310fe99 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/icongizmoimageprovider.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.cpp
index dd15a65595..56bdf1c603 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.cpp
@@ -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
 
 #ifdef QUICK3D_MODULE
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.h b/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.h
index d9eff21c76..413ce50775 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/lightgeometry.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.cpp
index c4a18f1e8f..5a206a0b60 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.cpp
@@ -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
 
 #ifdef QUICK3D_MODULE
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.h b/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.h
index 79ac58721d..99836276c1 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/linegeometry.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
index 7430fb0e95..2e78d84ac8 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #ifdef QUICK3D_MODULE
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.h b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.h
index a6bea46e59..c0a81a0ee3 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight.cpp
index dd43ba8221..3006be15da 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight.cpp
@@ -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
 
 #ifdef QUICK3D_MODULE
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight_p.h b/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight_p.h
index b1bda055b2..e82babcf4e 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight_p.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/qt5compat/qquick3darealight_p.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
index 360590a886..8a2a244996 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #ifdef QUICK3D_MODULE
 
diff --git a/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.h b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.h
index 46a9d25159..47c2eaf52f 100644
--- a/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.h
+++ b/src/tools/qml2puppet/qml2puppet/editor3d/selectionboxgeometry.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.cpp b/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.cpp
index f672f4e2f5..71e73026d1 100644
--- a/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.cpp
+++ b/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.cpp
@@ -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
 
 #include "iconrenderer.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.h b/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.h
index a585cc8ce5..f76f49dbed 100644
--- a/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.h
+++ b/src/tools/qml2puppet/qml2puppet/iconrenderer/iconrenderer.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/import3d/import3d.cpp b/src/tools/qml2puppet/qml2puppet/import3d/import3d.cpp
index 70857065ee..67f16241be 100644
--- a/src/tools/qml2puppet/qml2puppet/import3d/import3d.cpp
+++ b/src/tools/qml2puppet/qml2puppet/import3d/import3d.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
 
 #include "import3d.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/import3d/import3d.h b/src/tools/qml2puppet/qml2puppet/import3d/import3d.h
index 57b1013acc..ffeae23a6f 100644
--- a/src/tools/qml2puppet/qml2puppet/import3d/import3d.h
+++ b/src/tools/qml2puppet/qml2puppet/import3d/import3d.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
index 5a32a599fb..5a48514c36 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
@@ -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
 
 #include "anchorchangesnodeinstance.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.h
index cab4ba631a..2dbded62fb 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/anchorchangesnodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/animationdriver.cpp b/src/tools/qml2puppet/qml2puppet/instances/animationdriver.cpp
index bc8251f2d8..e825a50e63 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/animationdriver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/animationdriver.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
 
 #include "animationdriver.h"
 #include "private/qabstractanimation_p.h"
diff --git a/src/tools/qml2puppet/qml2puppet/instances/animationdriver.h b/src/tools/qml2puppet/qml2puppet/instances/animationdriver.h
index 8b945dc725..d4d330cfa7 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/animationdriver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/animationdriver.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.cpp
index dd15d24167..e27df75908 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.cpp
@@ -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
 
 #include "behaviornodeinstance.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.h
index 0203718d02..6c57b55d68 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/behaviornodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.cpp b/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.cpp
index df207c0ba7..fef44cb573 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.cpp
@@ -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
 
 #include "capturenodeinstanceserverdispatcher.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.h b/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.h
index 396caa4d72..2dbc4007f4 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/capturenodeinstanceserverdispatcher.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.cpp b/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.cpp
index 63a8070240..0ba741f858 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.cpp
@@ -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
 
 #include "childrenchangeeventfilter.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.h b/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.h
index 5e1a4c9dd6..45e74fc1dd 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/childrenchangeeventfilter.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.cpp
index a0b297c95f..294c52f312 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.cpp
@@ -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
 
 #include "componentnodeinstance.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.h
index ef0f89e27c..73a83a925f 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/componentnodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.cpp b/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.cpp
index c0074eccbc..2c260458be 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.cpp
@@ -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
 
 #include "dummycontextobject.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.h b/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.h
index cd5b884dfc..dc3d181730 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/dummycontextobject.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.cpp
index e993d4f8ea..d77b96a0e8 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.cpp
@@ -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
 
 #include "dummynodeinstance.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.h
index 1ab8ad4bf6..4c8c615850 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/dummynodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.cpp
index e895e58e40..e651c09655 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.cpp
@@ -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
 
 #include "layoutnodeinstance.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.h
index 015273b6ba..a5f74f24c6 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/layoutnodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.cpp
index 05692d000b..aff80c62af 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -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
 
 #include "nodeinstanceserver.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.h
index 70b0c84185..0fed4790ba 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserver.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.cpp b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.cpp
index 8a78b79cce..09910847a9 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.cpp
@@ -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
 
 #include "nodeinstanceserverdispatcher.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.h b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.h
index a691858c30..89e88065fb 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstanceserverdispatcher.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.cpp b/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.cpp
index 6688c809d5..8c25cae92a 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.cpp
@@ -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
 
 #include "nodeinstancesignalspy.h"
 #include "objectnodeinstance.h"
@@ -87,7 +87,8 @@ int NodeInstanceSignalSpy::qt_metacall(QMetaObject::Call call, int methodId, voi
         ObjectNodeInstance::Pointer nodeInstance = m_objectNodeInstance.toStrongRef();
 
         if (nodeInstance && nodeInstance->nodeInstanceServer() && nodeInstance->isValid()) {
-            foreach (const PropertyName &propertyName, m_indexPropertyHash.values(methodId))
+            const QList<PropertyName> values = m_indexPropertyHash.values(methodId);
+            for (const PropertyName &propertyName : values)
                 nodeInstance->nodeInstanceServer()->notifyPropertyChange(nodeInstance->instanceId(), propertyName);
         }
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.h b/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.h
index 6691da10fb..bf704f0cc1 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/nodeinstancesignalspy.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
index 0d601cb91e..281e6030a0 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -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
 
 #include "objectnodeinstance.h"
 
@@ -300,7 +300,7 @@ static void removeObjectFromList(const QQmlProperty &property,
 
     listReference.clear();
 
-    foreach (QObject *object, objectList)
+    for (QObject *object : std::as_const(objectList))
         listReference.append(object);
 }
 
@@ -802,7 +802,8 @@ QObject *ObjectNodeInstance::createComponentWrap(const QString &nodeSource, cons
 
     if (component->isError()) {
         qWarning() << "Error in:" << Q_FUNC_INFO << component->url().toString();
-        foreach (const QQmlError &error, component->errors())
+        const QList<QQmlError> errors = component->errors();
+        for (const QQmlError &error : errors)
             qWarning() << error;
         qWarning() << "file data:\n" << data;
     }
@@ -853,7 +854,8 @@ QObject *ObjectNodeInstance::createComponent([[maybe_unused]] const QString &com
 
     if (component.isError()) {
         qDebug() << componentPath;
-        foreach (const QQmlError &error, component.errors())
+        const QList<QQmlError> errors = component.errors();
+        for (const QQmlError &error : errors)
             qWarning() << error;
     }
 
@@ -888,7 +890,8 @@ QObject *ObjectNodeInstance::createCustomParserObject(const QString &nodeSource,
 
     if (component.isError()) {
         qWarning() << "Error in:" << Q_FUNC_INFO << component.url().toString();
-        foreach (const QQmlError &error, component.errors())
+        const QList<QQmlError> errors = component.errors();
+        for (const QQmlError &error : errors)
             qWarning() << error;
         qWarning() << "file data:\n" << data;
     }
diff --git a/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.h
index 0b2c0e6337..36abf66494 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.cpp
index ea83b83f33..fa55f30790 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.cpp
@@ -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
 
 #include "positionernodeinstance.h"
 #include <QQuickItem>
diff --git a/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.h
index a8052225f7..7506d73903 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/positionernodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp
index e353832013..8fa29118d7 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp
@@ -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
 
 #include "qmlpropertychangesnodeinstance.h"
 #include "qmlstatenodeinstance.h"
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
index 85285a7412..fb270b5ab2 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.cpp
index e60ca48da7..a62246b4a4 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.cpp
@@ -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
 
 #include "qmlstatenodeinstance.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.h
index 95fce95c1b..9ed5473f29 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmlstatenodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.cpp
index 6f0e01c457..183b9a7a84 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.cpp
@@ -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
 
 #include "qmltransitionnodeinstance.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.h
index 2fa9aca127..56d9594aa6 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qmltransitionnodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.cpp
index 55df28a3f9..99a6ba94a3 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.cpp
@@ -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
 
 #include "qt3dpresentationnodeinstance.h"
 #include <QQuickItem>
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.h
index 6d30b9809c..97de584d21 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt3dpresentationnodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.cpp
index de779748ae..70625962cc 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.cpp
@@ -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
 
 #include "qt5captureimagenodeinstanceserver.h"
 #include "servernodeinstance.h"
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.h
index 895daec5d6..f4a7c32a0c 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5captureimagenodeinstanceserver.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.cpp
index 3a03f7c9fb..22e0d92084 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.cpp
@@ -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
 
 #include "qt5capturepreviewnodeinstanceserver.h"
 #include "servernodeinstance.h"
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.h
index bb5e9816a0..9ab6bba54f 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5capturepreviewnodeinstanceserver.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index 48e6aeb13c..36c24d8573 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -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
 
 #include "qt5informationnodeinstanceserver.h"
 
@@ -1448,7 +1448,7 @@ Qt5InformationNodeInstanceServer::~Qt5InformationNodeInstanceServer()
 
 void Qt5InformationNodeInstanceServer::sendTokenBack()
 {
-    foreach (const TokenCommand &command, m_tokenList)
+    for (const TokenCommand &command : std::as_const(m_tokenList))
         nodeInstanceClient()->token(command);
 
     m_tokenList.clear();
@@ -1471,7 +1471,8 @@ bool Qt5InformationNodeInstanceServer::isDirtyRecursiveForNonInstanceItems(QQuic
     if (QQuickDesignerSupport::isDirty(item, informationsDirty))
         return true;
 
-    foreach (QQuickItem *childItem, item->childItems()) {
+    const QList<QQuickItem *> childItems = item->childItems();
+    for (QQuickItem *childItem : childItems) {
         if (!hasInstanceForObject(childItem)) {
             if (QQuickDesignerSupport::isDirty(childItem, informationsDirty))
                 return true;
@@ -1971,7 +1972,7 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands()
         QVector<InstancePropertyPair> propertyChangedList;
 
         if (quickWindow()) {
-            foreach (QQuickItem *item, allItems()) {
+            for (QQuickItem *item : allItems()) {
                 if (item && hasInstanceForObject(item)) {
                     ServerNodeInstance instance = instanceForObject(item);
 
@@ -1987,7 +1988,7 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands()
                 }
             }
 
-            foreach (const InstancePropertyPair& property, changedPropertyList()) {
+            for (const InstancePropertyPair& property : changedPropertyList()) {
                 const ServerNodeInstance instance = property.first;
                 if (instance.isValid()) {
                     if (property.second.contains("anchors"))
@@ -2031,7 +2032,7 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands()
 
 void Qt5InformationNodeInstanceServer::reparentInstances(const ReparentInstancesCommand &command)
 {
-    foreach (const ReparentContainer &container, command.reparentInstances()) {
+    for (const ReparentContainer &container : command.reparentInstances()) {
         if (hasInstanceForId(container.instanceId())) {
             ServerNodeInstance instance = instanceForId(container.instanceId());
             if (instance.isValid()) {
@@ -2094,7 +2095,7 @@ void Qt5InformationNodeInstanceServer::sendChildrenChangedCommand(const QList<Se
     QSet<ServerNodeInstance> parentSet;
     QList<ServerNodeInstance> noParentList;
 
-    foreach (const ServerNodeInstance &child, childList) {
+    for (const ServerNodeInstance &child : childList) {
         if (child.isValid()) {
             if (!child.hasParent()) {
                 noParentList.append(child);
@@ -2109,7 +2110,7 @@ void Qt5InformationNodeInstanceServer::sendChildrenChangedCommand(const QList<Se
         }
     }
 
-    foreach (const ServerNodeInstance &parent, parentSet)
+    for (const ServerNodeInstance &parent : std::as_const(parentSet))
         nodeInstanceClient()->childrenChanged(createChildrenChangedCommand(parent, parent.childItems()));
 
     if (!noParentList.isEmpty())
@@ -2122,7 +2123,8 @@ void Qt5InformationNodeInstanceServer::completeComponent(const CompleteComponent
     Qt5NodeInstanceServer::completeComponent(command);
 
     QList<ServerNodeInstance> instanceList;
-    foreach (qint32 instanceId, command.instances()) {
+    const QVector<qint32> instances = command.instances();
+    for (qint32 instanceId : instances) {
         if (hasInstanceForId(instanceId)) {
             ServerNodeInstance instance = instanceForId(instanceId);
             if (instance.isValid()) {
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
index 2099c184d9..c8b6c1c250 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
index e1029b3dda..c5c6f6dc96 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp
@@ -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
 
 #include "qt5nodeinstanceclientproxy.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h
index ac5d888311..7805bc473d 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
index 14672a2195..74481d150f 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.cpp
@@ -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
 
 #include "qt5nodeinstanceserver.h"
 
@@ -147,7 +147,7 @@ void Qt5NodeInstanceServer::resizeCanvasToRootItem()
 
 void Qt5NodeInstanceServer::resetAllItems()
 {
-    foreach (QQuickItem *item, allItems())
+    for (QQuickItem *item : allItems())
         QQuickDesignerSupport::resetDirty(item);
 }
 
@@ -167,13 +167,14 @@ QList<QQuickItem*> subItems(QQuickItem *parentItem)
     QList<QQuickItem*> itemList;
     itemList.append(parentItem->childItems());
 
-    foreach (QQuickItem *childItem, parentItem->childItems())
+    const QList<QQuickItem *> childItems = parentItem->childItems();
+    for (QQuickItem *childItem : childItems)
         itemList.append(subItems(childItem));
 
     return itemList;
 }
 
-QList<QQuickItem*> Qt5NodeInstanceServer::allItems() const
+const QList<QQuickItem*> Qt5NodeInstanceServer::allItems() const
 {
     if (rootNodeInstance().isValid())
         return rootNodeInstance().allItemsRecursive();
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h
index 046a0e61e5..ccbcc5c1e3 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5nodeinstanceserver.h
@@ -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
 
 #pragma once
 
@@ -57,7 +57,7 @@ protected:
     void resizeCanvasToRootItem() override;
     void resetAllItems();
     void setupScene(const CreateSceneCommand &command) override;
-    QList<QQuickItem*> allItems() const;
+    const QList<QQuickItem*> allItems() const;
     bool rootIsRenderable3DObject() const;
 
     struct RenderViewData {
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
index 125a128594..d20d0534b0 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
@@ -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
 
 #include "qt5previewnodeinstanceserver.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
index e4f860b6b6..396abb5da4 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
index 223a7249b1..0f0536ff0d 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
@@ -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
 
 #include "qt5rendernodeinstanceserver.h"
 
@@ -57,7 +57,7 @@ void Qt5RenderNodeInstanceServer::collectItemChangesAndSendChangeCommands()
         if (quickWindow() && nodeInstanceClient()->bytesToWrite() < 10000) {
             bool windowDirty = false;
             bool hasView3D = false;
-            foreach (QQuickItem *item, allItems()) {
+            for (QQuickItem *item : allItems()) {
                 if (item) {
                     if (Internal::QuickItemNodeInstance::unifiedRenderPath()) {
                         if (QQuickDesignerSupport::isDirty(item, QQuickDesignerSupport::AllMask)) {
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
index 13fdd7f8e5..53cb6fffb1 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp b/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
index ee0bc3ffdc..ca501b5eb3 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
@@ -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
 
 #include "qt5testnodeinstanceserver.h"
 
@@ -67,7 +67,7 @@ void Qt5TestNodeInstanceServer::changeFileUrl(const ChangeFileUrlCommand &comman
 void Qt5TestNodeInstanceServer::changePropertyValues(const ChangeValuesCommand &command)
 {
     bool hasDynamicProperties = false;
-    foreach (const PropertyValueContainer &container, command.valueChanges()) {
+    for (const PropertyValueContainer &container : command.valueChanges()) {
         hasDynamicProperties |= container.isDynamic();
         setInstancePropertyVariant(container);
     }
@@ -140,7 +140,7 @@ void Qt5TestNodeInstanceServer::removeInstances(const RemoveInstancesCommand &co
     if (activeStateInstance().isValid())
         activeStateInstance().deactivateState();
 
-    foreach (qint32 instanceId, command.instanceIds()) {
+    for (qint32 instanceId : command.instanceIds()) {
         removeInstanceRelationsip(instanceId);
     }
 
@@ -155,7 +155,7 @@ void Qt5TestNodeInstanceServer::removeInstances(const RemoveInstancesCommand &co
 void Qt5TestNodeInstanceServer::removeProperties(const RemovePropertiesCommand &command)
 {
     bool hasDynamicProperties = false;
-    foreach (const PropertyAbstractContainer &container, command.properties()) {
+    for (const PropertyAbstractContainer &container : command.properties()) {
         hasDynamicProperties |= container.isDynamic();
         resetInstanceProperty(container);
     }
@@ -168,7 +168,7 @@ void Qt5TestNodeInstanceServer::removeProperties(const RemovePropertiesCommand &
 
 void Qt5TestNodeInstanceServer::reparentInstances(const ReparentInstancesCommand &command)
 {
-    foreach (const ReparentContainer &container, command.reparentInstances()) {
+    for (const ReparentContainer &container : command.reparentInstances()) {
         if (hasInstanceForId(container.instanceId())) {
             ServerNodeInstance instance = instanceForId(container.instanceId());
             if (instance.isValid()) {
@@ -201,7 +201,7 @@ void Qt5TestNodeInstanceServer::completeComponent(const CompleteComponentCommand
 {
     QList<ServerNodeInstance> instanceList;
 
-    foreach (qint32 instanceId, command.instances()) {
+    for (qint32 instanceId : command.instances()) {
         if (hasInstanceForId(instanceId)) {
             ServerNodeInstance instance = instanceForId(instanceId);
             instance.doComponentComplete();
@@ -242,7 +242,7 @@ void QmlDesigner::Qt5TestNodeInstanceServer::collectItemChangesAndSendChangeComm
     QSet<ServerNodeInstance> parentChangedSet;
 
     if (quickWindow()) {
-        foreach (QQuickItem *item, allItems()) {
+        for (QQuickItem *item : allItems()) {
             if (item && hasInstanceForObject(item)) {
                 ServerNodeInstance instance = instanceForObject(item);
 
@@ -257,7 +257,7 @@ void QmlDesigner::Qt5TestNodeInstanceServer::collectItemChangesAndSendChangeComm
             }
         }
 
-        foreach (const InstancePropertyPair& property, changedPropertyList()) {
+        for (const InstancePropertyPair& property : changedPropertyList()) {
             const ServerNodeInstance instance = property.first;
             if (instance.isValid()) {
                 if (property.second.contains("anchors"))
@@ -292,7 +292,7 @@ void Qt5TestNodeInstanceServer::sendChildrenChangedCommand(const QList<ServerNod
     QSet<ServerNodeInstance> parentSet;
     QList<ServerNodeInstance> noParentList;
 
-    foreach (const ServerNodeInstance &child, childList) {
+    for (const ServerNodeInstance &child : childList) {
         if (!child.hasParent()) {
             noParentList.append(child);
         } else {
@@ -305,7 +305,7 @@ void Qt5TestNodeInstanceServer::sendChildrenChangedCommand(const QList<ServerNod
         }
     }
 
-    foreach (const ServerNodeInstance &parent, parentSet) {
+    for (const ServerNodeInstance &parent : std::as_const(parentSet)) {
         ChildrenChangedCommand command = createChildrenChangedCommand(parent, parent.childItems());
         command.sort();
         nodeInstanceClient()->childrenChanged(command);
@@ -329,7 +329,8 @@ bool Qt5TestNodeInstanceServer::isDirtyRecursiveForNonInstanceItems(QQuickItem *
     if (QQuickDesignerSupport::isDirty(item, informationsDirty))
         return true;
 
-    foreach (QQuickItem *childItem, item->childItems()) {
+    const QList<QQuickItem *> childItems = item->childItems();
+    for (QQuickItem *childItem : childItems) {
         if (!hasInstanceForObject(childItem)) {
             if (QQuickDesignerSupport::isDirty(childItem, informationsDirty))
                 return true;
diff --git a/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.h b/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.h
index ca5cf7b063..a967df34ff 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/qt5testnodeinstanceserver.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.cpp
index d518fa6ae5..a1fc5568aa 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #include "quick3dmaterialnodeinstance.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.h
index 84edfc2ea0..770644c6c0 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dmaterialnodeinstance.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.cpp
index 95e4a8281b..343dc363b5 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #include "quick3dnodeinstance.h"
 #include "qt5nodeinstanceserver.h"
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.h
index b8120a9092..b4d72823c1 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dnodeinstance.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.cpp
index 67741db5de..45540799cb 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #include "quick3drenderablenodeinstance.h"
 #include "qt5nodeinstanceserver.h"
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.h
index 98fba654d8..f5b63ea1b3 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3drenderablenodeinstance.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.cpp
index 4e63e88d54..4a0503d5bc 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.cpp
@@ -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
 
 #include "quick3dtexturenodeinstance.h"
 #include <QQuickItem>
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.h
index 77a3e32a2a..e09ce4dc48 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/quick3dtexturenodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp
index 918e147798..99bd116158 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.cpp
@@ -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
 
 #include "quickitemnodeinstance.h"
 #include "qt5nodeinstanceserver.h"
@@ -95,7 +95,8 @@ QList<ServerNodeInstance> QuickItemNodeInstance::childItems() const
 {
     QList<ServerNodeInstance> instanceList;
 
-    foreach (QQuickItem *childItem, quickItem()->childItems())
+    const QList<QQuickItem *> childItems = quickItem()->childItems();
+    for (QQuickItem *childItem : childItems)
     {
         if (childItem && nodeInstanceServer()->hasInstanceForObject(childItem)) {
             instanceList.append(nodeInstanceServer()->instanceForObject(childItem));
@@ -216,7 +217,8 @@ static QList<QQuickItem *> allChildItemsRecursive(QQuickItem *parentItem)
 
      itemList.append(parentItem->childItems());
 
-     foreach (QQuickItem *childItem, parentItem->childItems())
+     const QList<QQuickItem *> childItems = parentItem->childItems();
+     for (QQuickItem *childItem : childItems)
          itemList.append(allChildItemsRecursive(childItem));
 
      return itemList;
@@ -556,8 +558,8 @@ bool QuickItemNodeInstance::isRenderable() const
 QList<ServerNodeInstance> QuickItemNodeInstance::stateInstances() const
 {
     QList<ServerNodeInstance> instanceList;
-    QList<QObject*> stateList = QQuickDesignerSupport::statesForItem(quickItem());
-    foreach (QObject *state, stateList)
+    const QList<QObject*> stateList = QQuickDesignerSupport::statesForItem(quickItem());
+    for (QObject *state : stateList)
     {
         if (state && nodeInstanceServer()->hasInstanceForObject(state))
             instanceList.append(nodeInstanceServer()->instanceForObject(state));
@@ -596,7 +598,8 @@ Qt5NodeInstanceServer *QuickItemNodeInstance::qt5NodeInstanceServer() const
 
 void QuickItemNodeInstance::updateDirtyNodesRecursive(QQuickItem *parentItem) const
 {
-    foreach (QQuickItem *childItem, parentItem->childItems()) {
+    const QList<QQuickItem *> childItems = parentItem->childItems();
+    for (QQuickItem *childItem : childItems) {
         if (!nodeInstanceServer()->hasInstanceForObject(childItem))
             updateDirtyNodesRecursive(childItem);
     }
@@ -704,7 +707,8 @@ QList<ServerNodeInstance> QuickItemNodeInstance::childItemsForChild(QQuickItem *
     QList<ServerNodeInstance> instanceList;
 
     if (item) {
-        foreach (QQuickItem *childItem, item->childItems())
+        const QList<QQuickItem *> childItems = item->childItems();
+        for (QQuickItem *childItem : childItems)
         {
             if (childItem && nodeInstanceServer()->hasInstanceForObject(childItem)) {
                 instanceList.append(nodeInstanceServer()->instanceForObject(childItem));
@@ -738,7 +742,8 @@ bool QuickItemNodeInstance::anyItemHasContent(QQuickItem *quickItem)
     if (quickItem->flags().testFlag(QQuickItem::ItemHasContents))
         return true;
 
-    foreach (QQuickItem *childItem, quickItem->childItems()) {
+    const QList<QQuickItem *> childItems = quickItem->childItems();
+    for (QQuickItem *childItem : childItems) {
         if (anyItemHasContent(childItem))
             return true;
     }
@@ -748,7 +753,8 @@ bool QuickItemNodeInstance::anyItemHasContent(QQuickItem *quickItem)
 
 bool QuickItemNodeInstance::childItemsHaveContent(QQuickItem *quickItem)
 {
-    foreach (QQuickItem *childItem, quickItem->childItems()) {
+    const QList<QQuickItem *> childItems = quickItem->childItems();
+    for (QQuickItem *childItem : childItems) {
         if (anyItemHasContent(childItem))
             return true;
     }
@@ -1003,7 +1009,8 @@ QPair<PropertyName, ServerNodeInstance> QuickItemNodeInstance::anchor(const Prop
 bool QuickItemNodeInstance::isAnchoredBySibling() const
 {
     if (quickItem()->parentItem()) {
-        foreach (QQuickItem *siblingItem, quickItem()->parentItem()->childItems()) { // search in siblings for a anchor to this item
+        const QList<QQuickItem *> childItems = quickItem()->parentItem()->childItems();
+        for (QQuickItem *siblingItem : childItems) { // search in siblings for a anchor to this item
             if (siblingItem) {
                 if (QQuickDesignerSupport::isAnchoredTo(siblingItem, quickItem()))
                     return true;
diff --git a/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.h
index 65d84fac65..5955eaaa1b 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/quickitemnodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp
index e7229f06a6..eca115d432 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.cpp
@@ -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
 
 #include "servernodeinstance.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.h b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.h
index e60fceeea9..b8e45491a8 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/servernodeinstance.h
@@ -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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/instances/viewconfig.cpp b/src/tools/qml2puppet/qml2puppet/instances/viewconfig.cpp
index 39f108e49a..a2f74b0b84 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/viewconfig.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/viewconfig.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
 
 #include "viewconfig.h"
 #include <QtGlobal>
diff --git a/src/tools/qml2puppet/qml2puppet/instances/viewconfig.h b/src/tools/qml2puppet/qml2puppet/instances/viewconfig.h
index 17e4df1a47..95fadf8182 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/viewconfig.h
+++ b/src/tools/qml2puppet/qml2puppet/instances/viewconfig.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/main.cpp b/src/tools/qml2puppet/qml2puppet/main.cpp
index 84f273a31c..763bf77b5d 100644
--- a/src/tools/qml2puppet/qml2puppet/main.cpp
+++ b/src/tools/qml2puppet/qml2puppet/main.cpp
@@ -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
 
 #include "qmlpuppet.h"
 
diff --git a/src/tools/qml2puppet/qml2puppet/qmlbase.h b/src/tools/qml2puppet/qml2puppet/qmlbase.h
index 5fb67267a9..ae8995f489 100644
--- a/src/tools/qml2puppet/qml2puppet/qmlbase.h
+++ b/src/tools/qml2puppet/qml2puppet/qmlbase.h
@@ -1,6 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp b/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp
index f2d9ff405f..eab99ac37e 100644
--- a/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp
+++ b/src/tools/qml2puppet/qml2puppet/qmlpuppet.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #include "qmlpuppet.h"
 #include "configcrashpad.h"
diff --git a/src/tools/qml2puppet/qml2puppet/qmlpuppet.h b/src/tools/qml2puppet/qml2puppet/qmlpuppet.h
index 66838164cb..506b1c2a08 100644
--- a/src/tools/qml2puppet/qml2puppet/qmlpuppet.h
+++ b/src/tools/qml2puppet/qml2puppet/qmlpuppet.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/runner/loadwatcher.h b/src/tools/qml2puppet/qml2puppet/runner/loadwatcher.h
index 737557a45c..ece18d9d76 100644
--- a/src/tools/qml2puppet/qml2puppet/runner/loadwatcher.h
+++ b/src/tools/qml2puppet/qml2puppet/runner/loadwatcher.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/runner/qmlconfiguration.h b/src/tools/qml2puppet/qml2puppet/runner/qmlconfiguration.h
index 7563d7ce78..d3ccba2a33 100644
--- a/src/tools/qml2puppet/qml2puppet/runner/qmlconfiguration.h
+++ b/src/tools/qml2puppet/qml2puppet/runner/qmlconfiguration.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qml2puppet/runner/qmlruntime.cpp b/src/tools/qml2puppet/qml2puppet/runner/qmlruntime.cpp
index ed20c1a9d5..a4ade2b2b4 100644
--- a/src/tools/qml2puppet/qml2puppet/runner/qmlruntime.cpp
+++ b/src/tools/qml2puppet/qml2puppet/runner/qmlruntime.cpp
@@ -1,5 +1,5 @@
 // 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
 
 #include <QIcon>
 
diff --git a/src/tools/qml2puppet/qml2puppet/runner/qmlruntime.h b/src/tools/qml2puppet/qml2puppet/runner/qmlruntime.h
index c69481ca03..bb29506dd3 100644
--- a/src/tools/qml2puppet/qml2puppet/runner/qmlruntime.h
+++ b/src/tools/qml2puppet/qml2puppet/runner/qmlruntime.h
@@ -1,5 +1,5 @@
 // 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
 
 #pragma once
 
diff --git a/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
index b3e9af82dd..b9a65bb6b2 100644
--- a/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
+++ b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.cpp
@@ -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
 
 #include "qmlprivategate.h"
 
@@ -223,7 +223,7 @@ QVariant fixResourcePaths(const QVariant &value)
             const QString path = QLatin1String("qrc:") +  url.path();
             if (!qmlDesignerRCPath().isEmpty()) {
                 const QStringList searchPaths = qmlDesignerRCPath().split(QLatin1Char(';'));
-                foreach (const QString &qrcPath, searchPaths) {
+                for (const QString &qrcPath : searchPaths) {
                     const QStringList qrcDefintion = qrcPath.split(QLatin1Char('='));
                     if (qrcDefintion.count() == 2) {
                         QString fixedPath = path;
@@ -243,7 +243,7 @@ QVariant fixResourcePaths(const QVariant &value)
         if (str.contains(QLatin1String("qrc:"))) {
             if (!qmlDesignerRCPath().isEmpty()) {
                 const QStringList searchPaths = qmlDesignerRCPath().split(QLatin1Char(';'));
-                foreach (const QString &qrcPath, searchPaths) {
+                for (const QString &qrcPath : searchPaths) {
                     const QStringList qrcDefintion = qrcPath.split(QLatin1Char('='));
                     if (qrcDefintion.count() == 2) {
                         QString fixedPath = str;
@@ -377,13 +377,14 @@ void doComponentCompleteRecursive(QObject *object, NodeInstanceServer *nodeInsta
         QList<QObject*> childList = object->children();
 
         if (item) {
-            foreach (QQuickItem *childItem, item->childItems()) {
+            const QList<QQuickItem *> childItems = item->childItems();
+            for (QQuickItem *childItem : childItems){
                 if (!childList.contains(childItem))
                     childList.append(childItem);
             }
         }
 
-        foreach (QObject *child, childList) {
+        for (QObject *child : std::as_const(childList)) {
             if (!nodeInstanceServer->hasInstanceForObject(child))
                 doComponentCompleteRecursive(child, nodeInstanceServer);
         }
@@ -583,7 +584,7 @@ QAbstractFileEngine *QrcEngineHandler::create(const QString &fileName) const
 
     if (fileName.startsWith(":/")) {
         const QStringList searchPaths = qmlDesignerRCPath().split(';');
-        foreach (const QString &qrcPath, searchPaths) {
+        for (const QString &qrcPath : searchPaths) {
             const QStringList qrcDefintion = qrcPath.split('=');
             if (qrcDefintion.count() == 2) {
                 QString fixedPath = fileName;
diff --git a/src/tools/qml2puppet/qmlprivategate/qmlprivategate.h b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.h
index 7ba9e1b2ce..916aac3c7b 100644
--- a/src/tools/qml2puppet/qmlprivategate/qmlprivategate.h
+++ b/src/tools/qml2puppet/qmlprivategate/qmlprivategate.h
@@ -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
 
 #pragma once
author	Tim Jenßen <tim.jenssen@qt.io>	2023-03-26 15:58:49 +0200
committer	Tim Jenßen <tim.jenssen@qt.io>	2023-03-26 16:26:18 +0200
commit	feabda3aa78b7861ae03f1cc2296e8adf34ba038 (patch)
tree	9bc06c7eeb6fca92e8cdd273908f7350260a8cb8 /src/tools/qml2puppet
parent	359ea5d55a9452d70c20754c2380b1bf1c704c04 (diff)
parent	f7639f458a4b87263e96de70f26554a660148bc3 (diff)
download	qt-creator-feabda3aa78b7861ae03f1cc2296e8adf34ba038.tar.gz