diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:04:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:04:15 +0200 |
| commit | 95d79238beb2dd5832aaa044640d7a1bb0c790b3 (patch) | |
| tree | be43ebef8bcabf67857758ffe21997787c5a7bc4 /src/multimedia | |
| parent | d035d4de3770427396bd4e6a7db9b6c7161e2abf (diff) | |
| parent | bddfae90c6ae90f50d48ce9be5e70cb38c54385a (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie621069a6a069905ea40541c651de6e9e038994f
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/qmediatimerange.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h index 0b4fe8e67..5b6d711af 100644 --- a/src/multimedia/qmediatimerange.h +++ b/src/multimedia/qmediatimerange.h @@ -55,6 +55,7 @@ public: QMediaTimeInterval(); QMediaTimeInterval(qint64 start, qint64 end); QMediaTimeInterval(const QMediaTimeInterval&); + QMediaTimeInterval &operator=(const QMediaTimeInterval&) = default; qint64 start() const; qint64 end() const; |