diff options
Diffstat (limited to 'src/declarative/util/qmlpropertychanges.cpp')
| -rw-r--r-- | src/declarative/util/qmlpropertychanges.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp index b9ec67a..48e026e 100644 --- a/src/declarative/util/qmlpropertychanges.cpp +++ b/src/declarative/util/qmlpropertychanges.cpp @@ -209,7 +209,7 @@ QmlPropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant> > &list, QmlCustomParserProperty prop = qvariant_cast<QmlCustomParserProperty>(value); - QByteArray pre = propName + "."; + QByteArray pre = propName + '.'; compileList(list, pre, prop); } else { @@ -384,7 +384,7 @@ QmlPropertyChanges::ActionList QmlPropertyChanges::actions() a.restore = restoreEntryValues(); if (a.property.propertyType() == QVariant::Url && - (a.toValue.type() == QVariant::String || a.toValue.type() == QVariant::ByteArray) && !a.toValue.isNull()) + (a.toValue.userType() == QVariant::String || a.toValue.userType() == QVariant::ByteArray) && !a.toValue.isNull()) a.toValue.setValue(qmlContext(this)->resolvedUrl(QUrl(a.toValue.toString()))); list << a; |