From 63b5082ea8e3e750af986f815474f7207006cb46 Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Mon, 2 Sep 2013 17:29:48 +0200 Subject: Unhide QObject::parent() from QAbstract{Table,List}model. Both overwrite QAbstractItemModel's parent taking a QModelIndex which hides the QObject::parent() method. This must be explicitly forwarded like e.g. QAbstractItemModel is doing. Change-Id: I6149ae365cd8467248f4ca79a3cb898e62068b10 Reviewed-by: Stephen Kelly --- src/corelib/itemmodels/qabstractitemmodel.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/corelib') diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index ac98476492..95b9d271f3 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -432,6 +432,15 @@ public: int row, int column, const QModelIndex &parent); Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + +#ifdef Q_NO_USING_KEYWORD +#ifndef Q_QDOC + inline QObject *parent() const { return QAbstractItemModel::parent(); } +#endif +#else + using QObject::parent; +#endif + protected: QAbstractTableModel(QAbstractItemModelPrivate &dd, QObject *parent); @@ -454,6 +463,15 @@ public: int row, int column, const QModelIndex &parent); Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + +#ifdef Q_NO_USING_KEYWORD +#ifndef Q_QDOC + inline QObject *parent() const { return QAbstractItemModel::parent(); } +#endif +#else + using QObject::parent; +#endif + protected: QAbstractListModel(QAbstractItemModelPrivate &dd, QObject *parent); -- cgit v1.2.3