diff options
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/streamreader.cpp | 3 | ||||
| -rw-r--r-- | src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/gstreamer/streamreader.cpp b/src/3rdparty/phonon/gstreamer/streamreader.cpp index f8219e6..6718cbb 100644 --- a/src/3rdparty/phonon/gstreamer/streamreader.cpp +++ b/src/3rdparty/phonon/gstreamer/streamreader.cpp @@ -17,6 +17,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include "streamreader.h" #include <QtCore/QMutex> +#include <string.h> // memcpy #include <phonon/streaminterface.h> QT_BEGIN_NAMESPACE @@ -41,7 +42,7 @@ bool StreamReader::read(quint64 pos, int length, char * buffer) return false; // We didn't get any data } - qMemCopy(buffer, m_buffer.data(), length); + memcpy(buffer, m_buffer.data(), length); //truncate the buffer m_buffer = m_buffer.mid(pos); return true; diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h b/src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h index 933b5fa..b7e1bb7 100644 --- a/src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h +++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h @@ -40,7 +40,9 @@ class ListModelHelper : public QAbstractListModel using QAbstractListModel::layoutAboutToBeChanged; using QAbstractListModel::changePersistentIndexList; using QAbstractListModel::layoutChanged; +#if QT_DEPRECATED_SINCE(5,0) using QAbstractListModel::reset; +#endif using QAbstractListModel::beginInsertRows; using QAbstractListModel::endInsertRows; using QAbstractListModel::beginRemoveRows; |