diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-22 07:28:34 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-22 07:28:34 +0200 |
commit | 50908f023d83257dbc0b6d17bfe29e2f101615af (patch) | |
tree | de68e2d9587db1fb59d75505981b6ff033e12992 /src/corelib/itemmodels | |
parent | 7555a925816e3244073803f0adc4d44640f5ac1d (diff) | |
parent | d10e4c193b0152350e884adcc1060aabd1a974f7 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/platforms/ios/qiosviewcontroller.mm
Change-Id: I2dda31867cbc79ea7fe965f52afb518aefa4ad20
Diffstat (limited to 'src/corelib/itemmodels')
-rw-r--r-- | src/corelib/itemmodels/qabstractproxymodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/itemmodels/qabstractproxymodel.cpp b/src/corelib/itemmodels/qabstractproxymodel.cpp index 886b2d0d27..39bfdd7782 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.cpp +++ b/src/corelib/itemmodels/qabstractproxymodel.cpp @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE /*! \property QAbstractProxyModel::sourceModel - \brief the source model this proxy model. + \brief the source model of this proxy model. */ //detects the deletion of the source model |