diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-12 23:00:12 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-12 23:00:12 +0300 |
| commit | 37fface0a97cb8518b3bdb1e79b4cc81cc7fd215 (patch) | |
| tree | fca100ce24a901629c70a8c2706e2b791b401788 | |
| parent | 91968b8c6c9067e36bf4b75e72fff843f9256346 (diff) | |
| parent | fe2f23a7bf6444321981a090005430451ab94eaa (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 | 2 | ||||
| -rw-r--r-- | src/activeqt/doc/CMakeLists.txt | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.cmake.conf b/.cmake.conf index 1aa29ce..98c2813 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.5.6") +set(QT_REPO_MODULE_VERSION "6.5.7") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff --git a/dependencies.yaml b/dependencies.yaml index 0a37caa..0743c54 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../tqtc-qtbase: - ref: 5d8e9a8415562ba004b38508d91e1fa0254c17d3 + ref: fc0e66eefe3a08428ca4a6e92c66f37ac126d3c4 required: true diff --git a/src/activeqt/doc/CMakeLists.txt b/src/activeqt/doc/CMakeLists.txt index c9ff536..e3c1b33 100644 --- a/src/activeqt/doc/CMakeLists.txt +++ b/src/activeqt/doc/CMakeLists.txt @@ -2,5 +2,4 @@ # SPDX-License-Identifier: BSD-3-Clause add_library(ActiveQt INTERFACE) -target_link_libraries(ActiveQt INTERFACE Qt::Core) qt_internal_add_docs(ActiveQt activeqt.qdocconf) |