diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-03-25 06:06:38 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-03-25 06:42:02 (GMT) |
| commit | f4c7b4f046669a4a3d6ed1e8d538e17648d27b4d (patch) | |
| tree | 69098a2dbe0f9bed1fde83137a15899945487a8c /src | |
| parent | c2df63f457229ce8d3806a30f75221796c931c86 (diff) | |
| download | Qt-f4c7b4f046669a4a3d6ed1e8d538e17648d27b4d.zip Qt-f4c7b4f046669a4a3d6ed1e8d538e17648d27b4d.tar.gz Qt-f4c7b4f046669a4a3d6ed1e8d538e17648d27b4d.tar.bz2 | |
Protect the QDeclarativeListProperty used in QGraphicsItem with ifdef
Then it fixes the build
Reviewed-by:TrustMe
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativelist.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h index ed402a8..bd87990 100644 --- a/src/declarative/qml/qdeclarativelist.h +++ b/src/declarative/qml/qdeclarativelist.h @@ -54,6 +54,9 @@ QT_MODULE(Declarative) class QObject; struct QMetaObject; + +#ifndef QDECLARATIVELISTPROPERTY +#define QDECLARATIVELISTPROPERTY template<typename T> struct QDeclarativeListProperty { typedef void (*AppendFunction)(QDeclarativeListProperty<T> *, T*); @@ -106,6 +109,7 @@ private: return ((QList<T *> *)p->data)->clear(); } }; +#endif class QDeclarativeEngine; class QDeclarativeListReferencePrivate; |