diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-29 16:12:28 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-29 16:12:28 +0200 |
| commit | 7ac842cba18be081ac835bf40ac475ec4c47d30b (patch) | |
| tree | c35c8f45a56adf8df9ba018facce713a99d6074f /src/qmlcompiler/qqmljsfunctioninitializer.cpp | |
| parent | 9edb471d3a35b3dc40def86c395789086edaa983 (diff) | |
| parent | 3760c04fdea95b6e6d6ccac7c594993f063096fd (diff) | |
Merge tag 'v6.5.5-lts' into tqtc/lts-6.5-opensource
Qt 6.5.5-lts release
Conflicts solved:
dependencies.yaml
src/quick/doc/snippets/qml/treeview/qml-customdelegate.qml
Change-Id: Ifa297315fa0e6e70d9f26312f9183da4769d18fc
Diffstat (limited to 'src/qmlcompiler/qqmljsfunctioninitializer.cpp')
| -rw-r--r-- | src/qmlcompiler/qqmljsfunctioninitializer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmlcompiler/qqmljsfunctioninitializer.cpp b/src/qmlcompiler/qqmljsfunctioninitializer.cpp index a9322e90c8..4a3390314c 100644 --- a/src/qmlcompiler/qqmljsfunctioninitializer.cpp +++ b/src/qmlcompiler/qqmljsfunctioninitializer.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial #include "qqmljsfunctioninitializer_p.h" |