diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-26 12:46:51 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-26 12:55:50 +0300 |
| commit | 1180358ed7d621c1ff696dda397f130c2183e94e (patch) | |
| tree | 529d74a536e413883a1248870fb645fedbf8a711 | |
| parent | 4d5cab73c0ca3c5f4cb486ca5297724ceba52e6f (diff) | |
| parent | 401daf599b43b563df87ce88bacd37559aa46e56 (diff) | |
Merge tag 'v6.2.13-lts' into tqtc/lts-6.2-opensourcev6.2.13-lts-lgpl6.2
Qt 6.2.13-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I5cfa387b9d6aea3e87a3eff90cc81bd577335ddd
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 6 | ||||
| -rw-r--r-- | src/multimedia/audio/qwavedecoder.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/camera/qcamera.h | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/.cmake.conf b/.cmake.conf index 7733def21..0fcb9b1a0 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.12") +set(QT_REPO_MODULE_VERSION "6.2.13") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/dependencies.yaml b/dependencies.yaml index 269be8290..9dfd9cb5b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 3a82051eade32b34c2f4f6f652a9d8ef0db96c71 + ref: a963a536e623499cc56b0231c35dc5790a4bbc29 required: true ../tqtc-qtdeclarative: - ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde + ref: c6fdadd916a7568c1d71b750e054ca9aa2fd5dfc required: false ../tqtc-qtshadertools: - ref: ebe45c38bffcf8c3487949045f9ecf9c8a5f7e30 + ref: 4e8c28a3dc8d4dd6e237f7cc4235c078147385a2 required: true diff --git a/src/multimedia/audio/qwavedecoder.cpp b/src/multimedia/audio/qwavedecoder.cpp index 8d6173443..da67a9278 100644 --- a/src/multimedia/audio/qwavedecoder.cpp +++ b/src/multimedia/audio/qwavedecoder.cpp @@ -127,6 +127,10 @@ qint64 QWaveDecoder::pos() const return device->pos(); } +void QWaveDecoder::setIODevice(QIODevice * /* device */) +{ +} + QAudioFormat QWaveDecoder::audioFormat() const { return format; diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 735bdc77a..085367c71 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -70,7 +70,7 @@ class Q_MULTIMEDIA_EXPORT QCamera : public QObject Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) Q_PROPERTY(QCameraFormat cameraFormat READ cameraFormat WRITE setCameraFormat NOTIFY cameraFormatChanged) - Q_PROPERTY(FocusMode focusMode READ focusMode WRITE setFocusMode) + Q_PROPERTY(FocusMode focusMode READ focusMode WRITE setFocusMode NOTIFY focusModeChanged) Q_PROPERTY(QPointF focusPoint READ focusPoint NOTIFY focusPointChanged) Q_PROPERTY(QPointF customFocusPoint READ customFocusPoint WRITE setCustomFocusPoint NOTIFY customFocusPointChanged) Q_PROPERTY(float focusDistance READ focusDistance WRITE setFocusDistance NOTIFY focusDistanceChanged) |