From ce70756832fc5a33348aa8a7f4a54a466050499c Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 2 Oct 2012 20:20:21 +0200 Subject: Fix compilation with qtbase master. Both qMemCopy and QAbstractItemModel::reset have been deprecated. Change-Id: I222c807b344eec7ae292b48775baf51da9b650a8 Reviewed-by: Sean Harmer --- src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/3rdparty/phonon/phonon') 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; -- cgit v1.2.3