diff options
| author | Tarja Sundqvist <[email protected]> | 2025-07-02 10:15:21 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2025-07-02 10:15:21 +0300 |
| commit | ffe3f3565e8b9a5c7e0ea6b33dc7993d3902077e (patch) | |
| tree | a972df58b2ffee7a6be9e14aa58123c94226cfd2 /src/tools/moc/util | |
| parent | 3fe9e69e4d7510480544f928e8a07f0f110b2181 (diff) | |
| parent | c8c0c677693c047a9dbf94c2a88eb920ed11acc8 (diff) | |
Merge tag 'v6.5.5-lts-lgpl' into 6.5.56.5.5
Qt 6.5.5-lts-lgpl
Diffstat (limited to 'src/tools/moc/util')
| -rwxr-xr-x | src/tools/moc/util/generate.sh | 2 | ||||
| -rw-r--r-- | src/tools/moc/util/generate_keywords.cpp | 2 | ||||
| -rw-r--r-- | src/tools/moc/util/licenseheader.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh index 10baa544d2d..4514ca4930b 100755 --- a/src/tools/moc/util/generate.sh +++ b/src/tools/moc/util/generate.sh @@ -1,6 +1,6 @@ #!/bin/sh # Copyright (C) 2016 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 set -ex diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp index c152c1d6edb..fb78ae87d02 100644 --- a/src/tools/moc/util/generate_keywords.cpp +++ b/src/tools/moc/util/generate_keywords.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <stdio.h> #include <string.h> #include <qbytearray.h> diff --git a/src/tools/moc/util/licenseheader.txt b/src/tools/moc/util/licenseheader.txt index ab510e292a6..42958a66f5f 100644 --- a/src/tools/moc/util/licenseheader.txt +++ b/src/tools/moc/util/licenseheader.txt @@ -1,3 +1,3 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 |