diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-13 15:56:21 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-13 15:56:21 (GMT) |
commit | 41370bc3d87afbb5485d1246dc4bcd8ab6498aa8 (patch) | |
tree | 75f87410e58fcaca1f2d239ddc21609bfc1c5211 /src/gui/itemviews/qabstractproxymodel.cpp | |
parent | eef8caf294b45c8748cc7c74ddda82bec2869ecf (diff) | |
parent | c3b6b687e340d4d0c65789c3ac80dbaf2eb513b5 (diff) | |
download | Qt-41370bc3d87afbb5485d1246dc4bcd8ab6498aa8.zip Qt-41370bc3d87afbb5485d1246dc4bcd8ab6498aa8.tar.gz Qt-41370bc3d87afbb5485d1246dc4bcd8ab6498aa8.tar.bz2 |
Merge remote-tracking branch 'mainline/4.8'
Diffstat (limited to 'src/gui/itemviews/qabstractproxymodel.cpp')
-rw-r--r-- | src/gui/itemviews/qabstractproxymodel.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/itemviews/qabstractproxymodel.cpp b/src/gui/itemviews/qabstractproxymodel.cpp index 48c84ac..f00b7ee 100644 --- a/src/gui/itemviews/qabstractproxymodel.cpp +++ b/src/gui/itemviews/qabstractproxymodel.cpp @@ -298,6 +298,7 @@ bool QAbstractProxyModel::setHeaderData(int section, Qt::Orientation orientation /*! \reimp + \since 4.8 */ QModelIndex QAbstractProxyModel::buddy(const QModelIndex &index) const { @@ -307,6 +308,7 @@ QModelIndex QAbstractProxyModel::buddy(const QModelIndex &index) const /*! \reimp + \since 4.8 */ bool QAbstractProxyModel::canFetchMore(const QModelIndex &parent) const { @@ -316,6 +318,7 @@ bool QAbstractProxyModel::canFetchMore(const QModelIndex &parent) const /*! \reimp + \since 4.8 */ void QAbstractProxyModel::fetchMore(const QModelIndex &parent) { @@ -325,6 +328,7 @@ void QAbstractProxyModel::fetchMore(const QModelIndex &parent) /*! \reimp + \since 4.8 */ void QAbstractProxyModel::sort(int column, Qt::SortOrder order) { @@ -334,6 +338,7 @@ void QAbstractProxyModel::sort(int column, Qt::SortOrder order) /*! \reimp + \since 4.8 */ QSize QAbstractProxyModel::span(const QModelIndex &index) const { @@ -343,6 +348,7 @@ QSize QAbstractProxyModel::span(const QModelIndex &index) const /*! \reimp + \since 4.8 */ bool QAbstractProxyModel::hasChildren(const QModelIndex &parent) const { @@ -352,6 +358,7 @@ bool QAbstractProxyModel::hasChildren(const QModelIndex &parent) const /*! \reimp + \since 4.8 */ QMimeData* QAbstractProxyModel::mimeData(const QModelIndexList &indexes) const { @@ -364,6 +371,7 @@ QMimeData* QAbstractProxyModel::mimeData(const QModelIndexList &indexes) const /*! \reimp + \since 4.8 */ QStringList QAbstractProxyModel::mimeTypes() const { @@ -373,6 +381,7 @@ QStringList QAbstractProxyModel::mimeTypes() const /*! \reimp + \since 4.8 */ Qt::DropActions QAbstractProxyModel::supportedDropActions() const { |