diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-11 00:08:08 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-11 00:08:08 +0300 |
| commit | 87662a44c3ada6fa97cdbdab6a80cca8402bd0e3 (patch) | |
| tree | e94a79985248251d6c21d700f8eabe57e4eb523b | |
| parent | b687c560251966d89fe6a040441a6beaeee38ea7 (diff) | |
| parent | 5aa9ec6e2462aa85f8c8d6896b601b02f14b8367 (diff) | |
Merge tag 'v6.5.7-lts' into tqtc/lts-6.5-opensourcev6.5.7-lts-lgpl6.5
Qt 6.5.7-lts release
Conflicts solved:
dependencies.yaml
Change-Id: Ibb8498f8e1f07386c7340a65b91c648f2dd43569
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 6 | ||||
| -rw-r--r-- | src/imports/webchannel/plugins.qmltypes | 2 |
3 files changed, 5 insertions, 5 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 28a0fd5..f524900 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 5d8e9a8415562ba004b38508d91e1fa0254c17d3 + ref: fc0e66eefe3a08428ca4a6e92c66f37ac126d3c4 required: true ../tqtc-qtdeclarative: - ref: ff0a47c8f267e905113b82c53af2742027f0eca6 + ref: 844f9b9b376838bcb44324984876f8bf99d85d38 required: false ../tqtc-qtwebsockets: - ref: 66f52c598fbaaa2ad6db855f89035c3d0617e093 + ref: 40af0582a02548d6a5f17e331c9742cd24aa78c7 required: false diff --git a/src/imports/webchannel/plugins.qmltypes b/src/imports/webchannel/plugins.qmltypes index 68378d6..7782411 100644 --- a/src/imports/webchannel/plugins.qmltypes +++ b/src/imports/webchannel/plugins.qmltypes @@ -12,7 +12,7 @@ Module { name: "QQmlWebChannel" prototype: "QWebChannel" exports: ["QtWebChannel/WebChannel 1.0"] - exportMetaObjectRevisions: [0] + exportMetaObjectRevisions: [256] attachedType: "QQmlWebChannelAttached" Property { name: "transports"; type: "QObject"; isList: true; isReadonly: true } Property { name: "registeredObjects"; type: "QObject"; isList: true; isReadonly: true } |