diff options
author | Roberto Raggi <roberto.raggi@nokia.com> | 2011-08-18 16:35:56 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 13:18:28 +0200 |
commit | dbf89bcec8631cd9af472a5e9d7c386f4726a9f0 (patch) | |
tree | 6485d3743a1542a321ed247d04c28ebc34849d3a /src/declarative/qml/qdeclarativecompiler.cpp | |
parent | 50a12f04ee355752301ed54a7c21876621bb5dd4 (diff) |
Fix compilation.
Change-Id: I75433c3c716b6df33b75d32805fcca822f49a202
Reviewed-on: http://codereview.qt.nokia.com/3791
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 033bd6bc1c..7ae571c211 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -341,7 +341,7 @@ bool QDeclarativeCompiler::testLiteralAssignment(QDeclarativeParser::Property *p case QVariant::Vector4D: { bool ok; - QDeclarativeStringConverters::vector4DFromString(string, &ok); + QDeclarativeStringConverters::vector4DFromString(value.asString(), &ok); if (!ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: 4D vector expected")); } break; @@ -580,9 +580,9 @@ void QDeclarativeCompiler::genLiteralAssignment(QDeclarativeParser::Property *pr case QVariant::Vector4D: { bool ok; - QVector4D vector = QDeclarativeStringConverters::vector4DFromString(string, &ok); + QVector4D vector = QDeclarativeStringConverters::vector4DFromString(v->value.asString(), &ok); instr.setType(QDeclarativeInstruction::StoreVector4D); - instr.storeVector4D.propertyIndex = prop.propertyIndex(); + instr.storeVector4D.propertyIndex = prop->index; instr.storeVector4D.vector.xp = vector.x(); instr.storeVector4D.vector.yp = vector.y(); instr.storeVector4D.vector.zp = vector.z(); |