diff options
| author | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-04-17 17:39:03 +0200 |
|---|---|---|
| committer | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-04-17 17:39:03 +0200 |
| commit | 7015d2394e5a11b6244aefaa442626b6d05905a6 (patch) | |
| tree | 42030c5dd79fc489ac256fc443017286a2006683 /src/qgraphicstreeview.h | |
| parent | 303a0e83e35d41f5302368e49c23f2076dbd21cc (diff) | |
| parent | 6c773bae3a249606f35280da534afecb94d245a8 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:research/itemviews-ng
Conflicts:
src/qgraphicstreeview.h
Diffstat (limited to 'src/qgraphicstreeview.h')
| -rw-r--r-- | src/qgraphicstreeview.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qgraphicstreeview.h b/src/qgraphicstreeview.h index 39190b8..56266d1 100644 --- a/src/qgraphicstreeview.h +++ b/src/qgraphicstreeview.h @@ -94,7 +94,8 @@ public: inline QtGraphicsTreeViewItem *create(const QTreeModelIterator &it, QtGraphicsTreeView *view) const { return new T(it, view); } }; -class Q_GUI_EXPORT QtGraphicsTreeView : public QGraphicsWidget + +class Q_ITEMVIEWSNG_EXPORT QtGraphicsTreeView : public QGraphicsWidget { Q_OBJECT Q_PROPERTY(QtTreeModelBase* model READ model WRITE setModel) // ### |