summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-23 03:00:45 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-23 03:00:45 +0200
commit83996a65bb0887f582c9599a9763e659e2a9bb81 (patch)
tree77fc4aabf80e3ff5fb1f3e3eef1bd39c61fe0316
parentcbf7548779d399f97a3520a5842d506f9c5bace3 (diff)
parent5825dd2773755cea236d9816cc7541bc20f9cb80 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
-rw-r--r--src/multimedia/qmediatimerange.h1
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;