From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 18 Aug 2011 14:35:56 +0000 (+0200)
Subject: Fix compilation.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=dbf89bcec8631cd9af472a5e9d7c386f4726a9f0;p=konrad%2Fqtdeclarative.git

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>
---

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 033bd6b..7ae571c 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();