summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarja Sundqvist <[email protected]>2025-06-03 13:43:45 +0300
committerTarja Sundqvist <[email protected]>2025-06-03 13:43:45 +0300
commit13102102023a30599ce8ac379a7acb897294411a (patch)
tree18da1daef29dc2be2e007c8ae32354f420863f29
parentbae00f2af0c198e1df242d2af70ca3494e8ca732 (diff)
parent19f3d73e944f4c6348b672200f925b74f0503d50 (diff)
Merge tag 'v6.5.6-lts-lgpl' into 6.56.5
Qt 6.5.6-lts-lgpl release
-rw-r--r--.cmake.conf2
-rw-r--r--coin/module_config.yaml1
-rw-r--r--dependencies.yaml10
-rw-r--r--src/doc/src/concepts/qqem-concept.qdoc2
-rw-r--r--src/doc/src/getting-started/qqem-create-effect.qdoc2
-rw-r--r--src/doc/src/getting-started/qqem-installing.qdoc2
-rw-r--r--src/doc/src/how-tos/qqem-creating-blur-effect.qdoc2
-rw-r--r--src/doc/src/how-tos/qqem-port-shadertoy.qdoc2
-rw-r--r--src/doc/src/how-tos/qqem-porting-shadertoy.qdoc2
-rw-r--r--src/doc/src/qtquickeffectmaker.qdoc2
-rw-r--r--src/doc/src/reference/qqem-troubleshooting.qdoc2
11 files changed, 15 insertions, 14 deletions
diff --git a/.cmake.conf b/.cmake.conf
index c12f1ad..38824f3 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.5.5")
+set(QT_REPO_MODULE_VERSION "6.5.6")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 0404383..47a2126 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -1,4 +1,5 @@
version: 2
+alias: qtquickeffectmaker
accept_configuration:
condition: property
property: features
diff --git a/dependencies.yaml b/dependencies.yaml
index f3a812a..3f532bf 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,13 +1,13 @@
dependencies:
../tqtc-qtbase:
- ref: fdf57f5df57e7d12cf871699d857a71acf272e0c
+ ref: 5d8e9a8415562ba004b38508d91e1fa0254c17d3
required: true
../tqtc-qtdeclarative:
- ref: 7ac842cba18be081ac835bf40ac475ec4c47d30b
+ ref: ff0a47c8f267e905113b82c53af2742027f0eca6
required: true
../tqtc-qtquick3d:
- ref: d3cf878098cf399b00ecfa741e3d9d7d7964e42b
- required: false
+ ref: 730898b245931c55ff61ec3a892d600dfa37e175
+ required: true
../tqtc-qtshadertools:
- ref: 8191dce7e16f9bf42476c41a3b7aab9a62b26daa
+ ref: ac330781f44d174045e7a6770ed81c1dd29691f8
required: true
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