From 3f12e848168f61f986f2809cd7f8dac75408548f Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 11 Jul 2019 09:36:24 +0200 Subject: Move-enable QMediaTimeInterval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The class shouldn't have a user-provided copy ctor, because the compiler could write it for us and the type would be trivial, but we can't remove it in Qt 5, because that changes the way the class is passed by value into functions (register instead of stack). At least give it back its move special member functions, inhibited by the user-provided copy ctor, and schedule the whole lot for removal in Qt 6. Change-Id: Ic19ef43f3d313fea938aa769c067a736ec691337 Reviewed-by: Mårten Nordheim --- src/multimedia/qmediatimerange.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/multimedia/qmediatimerange.cpp') diff --git a/src/multimedia/qmediatimerange.cpp b/src/multimedia/qmediatimerange.cpp index 676d3d391..3a22e000f 100644 --- a/src/multimedia/qmediatimerange.cpp +++ b/src/multimedia/qmediatimerange.cpp @@ -94,6 +94,7 @@ QMediaTimeInterval::QMediaTimeInterval(qint64 start, qint64 end) } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! \fn QMediaTimeInterval::QMediaTimeInterval(const QMediaTimeInterval &other) @@ -105,6 +106,7 @@ QMediaTimeInterval::QMediaTimeInterval(const QMediaTimeInterval &other) { } +#endif /*! \fn QMediaTimeInterval::start() const -- cgit v1.2.3