summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-06-25 06:38:23 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-06-25 06:38:23 (GMT)
commit1d986e7f4c34fdcda2c1486a271a387ec08d3c46 (patch)
treee47bfd90213ecaaeb88e02650676c5186d61450d /src/declarative/util
parent03df7f73de6a1fd482876caaf377a61593df8a38 (diff)
parent46233eaa956e57a4c948cec759a3be606a8bdcb8 (diff)
downloadQt-1d986e7f4c34fdcda2c1486a271a387ec08d3c46.zip
Qt-1d986e7f4c34fdcda2c1486a271a387ec08d3c46.tar.gz
Qt-1d986e7f4c34fdcda2c1486a271a387ec08d3c46.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qdeclarativepropertychanges_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h
index c2ed466..bb0f944 100644
--- a/src/declarative/util/qdeclarativepropertychanges_p.h
+++ b/src/declarative/util/qdeclarativepropertychanges_p.h
@@ -79,6 +79,9 @@ public:
class QDeclarativePropertyChangesParser : public QDeclarativeCustomParser
{
public:
+ QDeclarativePropertyChangesParser()
+ : QDeclarativeCustomParser(AcceptsAttachedProperties) {}
+
void compileList(QList<QPair<QByteArray, QVariant> > &list, const QByteArray &pre, const QDeclarativeCustomParserProperty &prop);
virtual QByteArray compile(const QList<QDeclarativeCustomParserProperty> &);