summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativepropertychanges.cpp
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-03-30 11:28:02 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-03-30 11:28:02 (GMT)
commit753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7 (patch)
treefc1467525883912cc603174cbb55174d9201e4da /src/declarative/util/qdeclarativepropertychanges.cpp
parent9181ba917aa4f842e5c3e8febebe363f4dc11c6f (diff)
parent3ac354b885dcaf7186cf8bafdfc2bdc0c6d8dbd0 (diff)
downloadQt-753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7.zip
Qt-753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7.tar.gz
Qt-753ce0f7a2f16dd0303f6ad5493e9ce6bfc13fd7.tar.bz2
Merge remote branch 'qt/4.7' into 4.7
Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
Diffstat (limited to 'src/declarative/util/qdeclarativepropertychanges.cpp')
-rw-r--r--src/declarative/util/qdeclarativepropertychanges.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 8865e04..6ceec5d 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -227,6 +227,8 @@ QDeclarativePropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant>
const QVariant &value = values.at(ii);
if (value.userType() == qMetaTypeId<QDeclarativeCustomParserNode>()) {
+ error(qvariant_cast<QDeclarativeCustomParserNode>(value),
+ QDeclarativePropertyChanges::tr("PropertyChanges does not support creating state-specific objects."));
continue;
} else if(value.userType() == qMetaTypeId<QDeclarativeCustomParserProperty>()) {