diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 11:02:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 12:48:12 +0200 |
| commit | 6697f2a899fac47a65122a85691b2cfe63c6152c (patch) | |
| tree | 6ae8ad93c7455f9571d1b1b868ae077af89d96df /src/corelib/kernel/qabstractitemmodel.h | |
| parent | e577d02cc9cba2033cd21c23a4420a1f0d5469a4 (diff) | |
| parent | 1f806aa1b40db276dad359863d018171080d93f9 (diff) | |
Merge remote branch 'origin/master' into refactor
Conflicts:
src/gui/gui.pro
src/gui/painting/painting.pri
src/opengl/opengl.pro
src/openvg/openvg.pro
Diffstat (limited to 'src/corelib/kernel/qabstractitemmodel.h')
| -rw-r--r-- | src/corelib/kernel/qabstractitemmodel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qabstractitemmodel.h b/src/corelib/kernel/qabstractitemmodel.h index 6de3bf5e4f..7bed3a296e 100644 --- a/src/corelib/kernel/qabstractitemmodel.h +++ b/src/corelib/kernel/qabstractitemmodel.h @@ -162,6 +162,7 @@ class Q_CORE_EXPORT QAbstractItemModel : public QObject friend class QPersistentModelIndexData; friend class QAbstractItemViewPrivate; + friend class QIdentityProxyModel; public: explicit QAbstractItemModel(QObject *parent = 0); |