summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2012-10-02 20:20:21 +0200
committerSean Harmer <sean.harmer@kdab.com>2012-10-02 20:22:41 +0200
commitce70756832fc5a33348aa8a7f4a54a466050499c (patch)
tree319fa384debb7a836a2606fa78d4ad13cc88aa2a /src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h
parent4e720fa967548a40bce338fe647632d8bdf0f878 (diff)
Fix compilation with qtbase master.HEADmaster
Both qMemCopy and QAbstractItemModel::reset have been deprecated. Change-Id: I222c807b344eec7ae292b48775baf51da9b650a8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h')
-rw-r--r--src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h2
1 files changed, 2 insertions, 0 deletions
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;