diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-30 22:59:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-07-02 11:23:45 +0200 |
| commit | e3ed2281c0c891cf3b15c95f9f7cdae42e9f233a (patch) | |
| tree | aae8da6ce616eae02b69fb1fcdcb4383c8fe6811 /src/corelib/itemmodels | |
| parent | 3be141d5bc199080b524d8f6f5ce514e8f74d23a (diff) | |
| parent | e75e4b39b78ba05ea2cd45dc96acf99fc89c5915 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/cocoa/qnsview_dragging.mm
src/plugins/platforms/ios/qiosinputcontext.mm
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/tools/androiddeployqt/main.cpp
Was moved from qttools into qtbase in 5.11.
So re-apply 32398e4d here.
tests/auto/corelib/global/qlogging/test/test.pro
tests/auto/corelib/global/qlogging/tst_qlogging.cpp
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
tests/auto/corelib/thread/qthreadstorage/test/test.pro
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
tests/auto/widgets/kernel/qapplication/test/test.pro
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Done-with: Mårten Nordheim <marten.nordheim@qt.io>
Done-with: Oliver Wolff <oliver.wolff@qt.io>
Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
Diffstat (limited to 'src/corelib/itemmodels')
| -rw-r--r-- | src/corelib/itemmodels/qabstractitemmodel.cpp | 18 | ||||
| -rw-r--r-- | src/corelib/itemmodels/qidentityproxymodel.cpp | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index d826110ec7..3a6f67521f 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -182,8 +182,8 @@ QPersistentModelIndex::~QPersistentModelIndex() Returns \c{true} if this persistent model index is equal to the \a other persistent model index; otherwise returns \c{false}. - All values in the persistent model index are used when comparing - with another persistent model index. + The internal data pointer, row, column, and model values in the persistent + model index are used when comparing with another persistent model index. */ bool QPersistentModelIndex::operator==(const QPersistentModelIndex &other) const @@ -199,8 +199,8 @@ bool QPersistentModelIndex::operator==(const QPersistentModelIndex &other) const Returns \c{true} if this persistent model index is smaller than the \a other persistent model index; otherwise returns \c{false}. - All values in the persistent model index are used when comparing - with another persistent model index. + The internal data pointer, row, column, and model values in the persistent + model index are used when comparing with another persistent model index. */ bool QPersistentModelIndex::operator<(const QPersistentModelIndex &other) const @@ -275,13 +275,11 @@ QPersistentModelIndex::operator const QModelIndex&() const } /*! - \fn bool QPersistentModelIndex::operator==(const QModelIndex &other) const - Returns \c{true} if this persistent model index refers to the same location as the \a other model index; otherwise returns \c{false}. - All values in the persistent model index are used when comparing with - another model index. + The internal data pointer, row, column, and model values in the persistent + model index are used when comparing with another model index. */ bool QPersistentModelIndex::operator==(const QModelIndex &other) const @@ -1167,8 +1165,8 @@ void QAbstractItemModel::resetInternalData() Returns \c{true} if this model index refers to the same location as the \a other model index; otherwise returns \c{false}. - All values in the model index are used when comparing with another model - index. + The internal data pointer, row, column, and model values are used when + comparing with another model index. */ diff --git a/src/corelib/itemmodels/qidentityproxymodel.cpp b/src/corelib/itemmodels/qidentityproxymodel.cpp index e984ec194e..c1e23dbd0c 100644 --- a/src/corelib/itemmodels/qidentityproxymodel.cpp +++ b/src/corelib/itemmodels/qidentityproxymodel.cpp @@ -83,7 +83,7 @@ class QIdentityProxyModelPrivate : public QAbstractProxyModelPrivate \since 4.8 \class QIdentityProxyModel \inmodule QtCore - \brief The QIdentityProxyModel class proxies its source model unmodified + \brief The QIdentityProxyModel class proxies its source model unmodified. \ingroup model-view |