diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:55:23 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:55:23 (GMT) |
| commit | 1f5e32a11114370e4364fcfa77b9c4ab4bf192a3 (patch) | |
| tree | 5761a1e1d6dfac01c50d1c91187c20378383fe6f /src/gui/itemviews/qabstractitemview_p.h | |
| parent | f60dea8315fef502f6f4c6941455a51bee66efd9 (diff) | |
| parent | 6470f646d0815f67bab507c1362cdda775c42a6e (diff) | |
| download | Qt-1f5e32a11114370e4364fcfa77b9c4ab4bf192a3.zip Qt-1f5e32a11114370e4364fcfa77b9c4ab4bf192a3.tar.gz Qt-1f5e32a11114370e4364fcfa77b9c4ab4bf192a3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
src/declarative/fx/qfxitem.h
src/declarative/util/qfxview.h
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'src/gui/itemviews/qabstractitemview_p.h')
| -rw-r--r-- | src/gui/itemviews/qabstractitemview_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h index 7443d50..557e98b 100644 --- a/src/gui/itemviews/qabstractitemview_p.h +++ b/src/gui/itemviews/qabstractitemview_p.h @@ -86,6 +86,9 @@ struct QEditorInfo }; +typedef QPair<QRect, QModelIndex> QItemViewPaintPair; +typedef QList<QItemViewPaintPair> QItemViewPaintPairs; + class QEmptyModel : public QAbstractItemModel { public: @@ -176,7 +179,9 @@ public: q_func()->style()->drawPrimitive(QStyle::PE_IndicatorItemViewItemDrop, &opt, painter, q_func()); } } + #endif + virtual QItemViewPaintPairs draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const; inline void releaseEditor(QWidget *editor) const { if (editor) { |