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 | 4ddff811c2f6d73176023798ea9aadfa60d50a90 (patch) | |
| tree | a930d9644c83e1358c1ea24a6018bcf2f5d27193 | |
| parent | ba0eed64c32975e2aa36ee5577969a7e5690bcef (diff) | |
| parent | 7190a3e4664062401263ecad62b2c33ca00f60cf (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 | 4 | ||||
| -rw-r--r-- | src/timeline/qquickkeyframe.cpp | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf index 5096a44..d453dc6 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,4 +1,4 @@ -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") # Use cpp-based syncqt diff --git a/dependencies.yaml b/dependencies.yaml index 626fb27..bd25292 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 5d8e9a8415562ba004b38508d91e1fa0254c17d3 + ref: fc0e66eefe3a08428ca4a6e92c66f37ac126d3c4 required: true ../tqtc-qtdeclarative: - ref: ff0a47c8f267e905113b82c53af2742027f0eca6 + ref: 844f9b9b376838bcb44324984876f8bf99d85d38 required: true diff --git a/src/timeline/qquickkeyframe.cpp b/src/timeline/qquickkeyframe.cpp index 022d1b6..64bb8da 100644 --- a/src/timeline/qquickkeyframe.cpp +++ b/src/timeline/qquickkeyframe.cpp @@ -88,6 +88,8 @@ void QQuickKeyframeGroupPrivate::loadKeyframes(bool fromBinary) reader.addData(keyframeData); } + auto cleanup = qScopeGuard([&dataFile] { dataFile.close(); }); + // Check that file is standard keyframes CBOR and get the version int version = readKeyframesHeader(reader); @@ -119,7 +121,6 @@ void QQuickKeyframeGroupPrivate::loadKeyframes(bool fromBinary) // Leave root array reader.leaveContainer(); - } void QQuickKeyframeGroupPrivate::append_keyframe(QQmlListProperty<QQuickKeyframe> *list, QQuickKeyframe *a) |