diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-03-04 18:22:02 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-03-04 18:22:02 (GMT) |
| commit | 2542f8b565e90378145c048b3a6982f4749c6392 (patch) | |
| tree | d48a2a8988a778e16cf73aac4d0b5709b82f0082 /demos/interview/model.h | |
| parent | 4f2203e481cc1663776e7b87b082cf0dd42849fd (diff) | |
| parent | 364ba2bfeeab574d2ae940e4387d3c90b2a46dcd (diff) | |
| download | Qt-2542f8b565e90378145c048b3a6982f4749c6392.zip Qt-2542f8b565e90378145c048b3a6982f4749c6392.tar.gz Qt-2542f8b565e90378145c048b3a6982f4749c6392.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'demos/interview/model.h')
| -rw-r--r-- | demos/interview/model.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/demos/interview/model.h b/demos/interview/model.h index bad83a8..c7c15f7 100644 --- a/demos/interview/model.h +++ b/demos/interview/model.h @@ -44,6 +44,7 @@ #include <QAbstractItemModel> #include <QFileIconProvider> +#include <QIcon> #include <QVector> class Model : public QAbstractItemModel @@ -80,6 +81,7 @@ private: Node *parent(Node *child) const; int row(Node *node) const; + QIcon services; int rc, cc; QVector<Node> *tree; QFileIconProvider iconProvider; |