diff options
| author | axis <qt-info@nokia.com> | 2009-11-03 10:16:33 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-03 10:16:33 (GMT) |
| commit | 51f258fb39e5bac9d3a2757afd8661e63c3d2680 (patch) | |
| tree | d5788c8e530476443b5218d6ae5f94e1e064d40e /src/gui/itemviews/qabstractitemview_p.h | |
| parent | 1ef5dddf91c666664911686ca77cb6c1b2cde828 (diff) | |
| parent | 9fab0ede200960f0dbec1457757a6ba3214c3ce6 (diff) | |
| download | Qt-51f258fb39e5bac9d3a2757afd8661e63c3d2680.zip Qt-51f258fb39e5bac9d3a2757afd8661e63c3d2680.tar.gz Qt-51f258fb39e5bac9d3a2757afd8661e63c3d2680.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/gui/itemviews/qabstractitemview_p.h')
| -rw-r--r-- | src/gui/itemviews/qabstractitemview_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h index fcf381a..c691f61 100644 --- a/src/gui/itemviews/qabstractitemview_p.h +++ b/src/gui/itemviews/qabstractitemview_p.h @@ -117,6 +117,7 @@ public: virtual void _q_columnsInserted(const QModelIndex &parent, int start, int end); virtual void _q_modelDestroyed(); virtual void _q_layoutChanged(); + void _q_headerDataChanged() { doDelayedItemsLayout(); } void fetchMore(); @@ -164,7 +165,8 @@ public: } #ifndef QT_NO_DRAGANDDROP - QAbstractItemView::DropIndicatorPosition position(const QPoint &pos, const QRect &rect, const QModelIndex &idx) const; + virtual QAbstractItemView::DropIndicatorPosition position(const QPoint &pos, const QRect &rect, const QModelIndex &idx) const; + inline bool canDecode(QDropEvent *e) const { QStringList modelTypes = model->mimeTypes(); const QMimeData *mime = e->mimeData(); |