diff options
Diffstat (limited to 'src/declarative/util/qdeclarativepropertychanges.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativepropertychanges.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index 039803002c..3684b38048 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -240,11 +240,11 @@ public: }; void -QDeclarativePropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant> > &list, - const QByteArray &pre, +QDeclarativePropertyChangesParser::compileList(QList<QPair<QString, QVariant> > &list, + const QString &pre, const QDeclarativeCustomParserProperty &prop) { - QByteArray propName = pre + prop.name(); + QString propName = pre + prop.name(); QList<QVariant> values = prop.assignedValues(); for (int ii = 0; ii < values.count(); ++ii) { @@ -258,7 +258,7 @@ QDeclarativePropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant> QDeclarativeCustomParserProperty prop = qvariant_cast<QDeclarativeCustomParserProperty>(value); - QByteArray pre = propName + '.'; + QString pre = propName + QLatin1Char('.'); compileList(list, pre, prop); } else { @@ -270,9 +270,9 @@ QDeclarativePropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant> QByteArray QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserProperty> &props) { - QList<QPair<QByteArray, QVariant> > data; + QList<QPair<QString, QVariant> > data; for(int ii = 0; ii < props.count(); ++ii) - compileList(data, QByteArray(), props.at(ii)); + compileList(data, QString(), props.at(ii)); QByteArray rv; QDataStream ds(&rv, QIODevice::WriteOnly); @@ -304,7 +304,7 @@ QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserP break; } - ds << QString::fromUtf8(data.at(ii).first) << isScript << var; + ds << data.at(ii).first << isScript << var; if (isScript) ds << id; } |