diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-12 23:00:30 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-12 23:00:30 +0300 |
| commit | ec49f2f98f8f5bf00b7b6f1cdb13aceea0e25861 (patch) | |
| tree | 0fdec31743a74561c9e0c32f51f8cce989ce1f78 | |
| parent | 13102102023a30599ce8ac379a7acb897294411a (diff) | |
| parent | 9b91258f798a9d96b8224ea373c83038e70593e0 (diff) | |
Merge tag 'v6.5.7-lts-lgpl' into 6.56.5
Qt 6.5.7-lts-lgpl release
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 10 | ||||
| -rw-r--r-- | src/doc/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/.cmake.conf b/.cmake.conf index 38824f3..faf0514 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.5.6") +set(QT_REPO_MODULE_VERSION "6.5.7") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") diff --git a/dependencies.yaml b/dependencies.yaml index 3f532bf..d764c27 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtbase: - ref: 5d8e9a8415562ba004b38508d91e1fa0254c17d3 + ref: fc0e66eefe3a08428ca4a6e92c66f37ac126d3c4 required: true ../tqtc-qtdeclarative: - ref: ff0a47c8f267e905113b82c53af2742027f0eca6 + ref: 844f9b9b376838bcb44324984876f8bf99d85d38 required: true ../tqtc-qtquick3d: - ref: 730898b245931c55ff61ec3a892d600dfa37e175 - required: true + ref: 889447b1f96230f9043422a8ad1a6202854235d8 + required: false ../tqtc-qtshadertools: - ref: ac330781f44d174045e7a6770ed81c1dd29691f8 + ref: 4c6749e750764297ee4237d9a1f2657b8313c4f7 required: true diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt index 70ca380..1aac150 100644 --- a/src/doc/CMakeLists.txt +++ b/src/doc/CMakeLists.txt @@ -1,6 +1,4 @@ add_library(QtQuickEffectMakerDoc INTERFACE) -target_link_libraries(QtQuickEffectMakerDoc INTERFACE Qt::Core) - qt_internal_add_docs(QtQuickEffectMakerDoc qtquickeffectmaker.qdocconf ) |