diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-24 15:26:10 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-24 15:26:10 (GMT) |
| commit | 270c374c178ec5a532d37168b018cd7ebc844558 (patch) | |
| tree | a1f3b19daae4a40c296f127b0f8af64107c2c29a /src/gui/itemviews/qstandarditemmodel_p.h | |
| parent | 4d593220a8521c75821609560a3f7e09e28988c5 (diff) | |
| parent | 9e4f5f2133b542cdf6f32f2fc96dccd864e68420 (diff) | |
| download | Qt-270c374c178ec5a532d37168b018cd7ebc844558.zip Qt-270c374c178ec5a532d37168b018cd7ebc844558.tar.gz Qt-270c374c178ec5a532d37168b018cd7ebc844558.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
examples/webkit/formextractor/formextractor.pro
mkspecs/features/qt.prf
src/gui/painting/qpaintengineex.cpp
Diffstat (limited to 'src/gui/itemviews/qstandarditemmodel_p.h')
| -rw-r--r-- | src/gui/itemviews/qstandarditemmodel_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/itemviews/qstandarditemmodel_p.h b/src/gui/itemviews/qstandarditemmodel_p.h index 53ee6e3..3f6e0ca 100644 --- a/src/gui/itemviews/qstandarditemmodel_p.h +++ b/src/gui/itemviews/qstandarditemmodel_p.h @@ -176,6 +176,8 @@ public: void _q_emitItemChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); + void decodeDataRecursive(QDataStream &stream, QStandardItem *item); + QVector<QStandardItem*> columnHeaderItems; QVector<QStandardItem*> rowHeaderItems; QScopedPointer<QStandardItem> root; |