diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-26 12:00:43 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-26 12:00:43 (GMT) |
| commit | 85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34 (patch) | |
| tree | 191b227596f18333f1609ff824d2746dd7f1090f /src/declarative/util/qlistmodelinterface_p.h | |
| parent | 26139fcacc05b4a74fce1ef4e0db819118765310 (diff) | |
| parent | 2d071521228a6bc9ef423cbdbbd8560d28208790 (diff) | |
| download | Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.zip Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.tar.gz Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'src/declarative/util/qlistmodelinterface_p.h')
| -rw-r--r-- | src/declarative/util/qlistmodelinterface_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/util/qlistmodelinterface_p.h b/src/declarative/util/qlistmodelinterface_p.h index 8c8ebb3..8b62fc4 100644 --- a/src/declarative/util/qlistmodelinterface_p.h +++ b/src/declarative/util/qlistmodelinterface_p.h @@ -45,13 +45,15 @@ #include <QtCore/QHash> #include <QtCore/QVariant> +#include <private/qdeclarativeglobal_p.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_DECLARATIVE_EXPORT QListModelInterface : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QListModelInterface : public QObject { Q_OBJECT public: |