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/shared | |
| 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/shared')
| -rw-r--r-- | src/tools/shared/depfile_shared.h | 2 | ||||
| -rw-r--r-- | src/tools/shared/shellquote_shared.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/shared/depfile_shared.h b/src/tools/shared/depfile_shared.h index b95843b0457..411a7a11105 100644 --- a/src/tools/shared/depfile_shared.h +++ b/src/tools/shared/depfile_shared.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 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 #ifndef QTBASE_DEPFILE_SHARED_H #define QTBASE_DEPFILE_SHARED_H diff --git a/src/tools/shared/shellquote_shared.h b/src/tools/shared/shellquote_shared.h index 3f60a743b57..7a9ab691da8 100644 --- a/src/tools/shared/shellquote_shared.h +++ b/src/tools/shared/shellquote_shared.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 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 #ifndef SHELLQUOTE_SHARED_H #define SHELLQUOTE_SHARED_H |