diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-07-02 10:21:17 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-07-02 10:21:17 +0300 |
| commit | adfd601fcbe44c5049ace4799374150a5acccfc7 (patch) | |
| tree | 4956d769f3764d7262d24d501ff7540db48fa868 | |
| parent | bae00f2af0c198e1df242d2af70ca3494e8ca732 (diff) | |
| parent | a111bd85b51e5974379471ad350acebb5f948dbc (diff) | |
Merge tag 'v6.5.5-lts-lgpl' into 6.5.56.5.5
Qt 6.5.5-lts-lgpl release
| -rw-r--r-- | src/doc/src/concepts/qqem-concept.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/getting-started/qqem-create-effect.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/getting-started/qqem-installing.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/how-tos/qqem-creating-blur-effect.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/how-tos/qqem-port-shadertoy.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/how-tos/qqem-porting-shadertoy.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/qtquickeffectmaker.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/reference/qqem-troubleshooting.qdoc | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/doc/src/concepts/qqem-concept.qdoc b/src/doc/src/concepts/qqem-concept.qdoc index 5713824..80fbeb6 100644 --- a/src/doc/src/concepts/qqem-concept.qdoc +++ b/src/doc/src/concepts/qqem-concept.qdoc @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qqem-concept.html diff --git a/src/doc/src/getting-started/qqem-create-effect.qdoc b/src/doc/src/getting-started/qqem-create-effect.qdoc index ce68cb5..1b03bb8 100644 --- a/src/doc/src/getting-started/qqem-create-effect.qdoc +++ b/src/doc/src/getting-started/qqem-create-effect.qdoc @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qqem-create-first-effect.html diff --git a/src/doc/src/getting-started/qqem-installing.qdoc b/src/doc/src/getting-started/qqem-installing.qdoc index 0677d0e..06583ac 100644 --- a/src/doc/src/getting-started/qqem-installing.qdoc +++ b/src/doc/src/getting-started/qqem-installing.qdoc @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qqem-installing.html diff --git a/src/doc/src/how-tos/qqem-creating-blur-effect.qdoc b/src/doc/src/how-tos/qqem-creating-blur-effect.qdoc index e3243fe..42769c1 100644 --- a/src/doc/src/how-tos/qqem-creating-blur-effect.qdoc +++ b/src/doc/src/how-tos/qqem-creating-blur-effect.qdoc @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qqem-creating-blur-effect.html diff --git a/src/doc/src/how-tos/qqem-port-shadertoy.qdoc b/src/doc/src/how-tos/qqem-port-shadertoy.qdoc index 8b3b339..79fa859 100644 --- a/src/doc/src/how-tos/qqem-port-shadertoy.qdoc +++ b/src/doc/src/how-tos/qqem-port-shadertoy.qdoc @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qqem-porting-shadertoy.html \previouspage qqem-concept.html diff --git a/src/doc/src/how-tos/qqem-porting-shadertoy.qdoc b/src/doc/src/how-tos/qqem-porting-shadertoy.qdoc index 983ff33..fbd3421 100644 --- a/src/doc/src/how-tos/qqem-porting-shadertoy.qdoc +++ b/src/doc/src/how-tos/qqem-porting-shadertoy.qdoc @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qqem-porting-shadertoy.html \title Porting Shadertoy effects to \QQEM diff --git a/src/doc/src/qtquickeffectmaker.qdoc b/src/doc/src/qtquickeffectmaker.qdoc index b8f32b2..ef1d519 100644 --- a/src/doc/src/qtquickeffectmaker.qdoc +++ b/src/doc/src/qtquickeffectmaker.qdoc @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qtquickeffectmaker-index.html \title \QQEM diff --git a/src/doc/src/reference/qqem-troubleshooting.qdoc b/src/doc/src/reference/qqem-troubleshooting.qdoc index 7b4ce02..7269479 100644 --- a/src/doc/src/reference/qqem-troubleshooting.qdoc +++ b/src/doc/src/reference/qqem-troubleshooting.qdoc @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qqem-troubleshooting.html |