Add QColor support to v4.

[profile/ivi/qtdeclarative.git] / src / declarative / qml / v4 / qv4ir_p.h

diff --git a/src/declarative/qml/v4/qv4ir_p.h b/src/declarative/qml/v4/qv4ir_p.h
index 9dbd220..f6aae06 100644 (file)
--- a/src/declarative/qml/v4/qv4ir_p.h
+++ b/src/declarative/qml/v4/qv4ir_p.h
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
@@ -35,6 +34,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -142,7 +142,7 @@ enum Type {
     VoidType,
     StringType,
     UrlType,
-    AnchorLineType,
+    ColorType,
     SGAnchorLineType,
     AttachType,
     ObjectType,
@@ -269,7 +269,7 @@ struct Name: Expr {
         const QDeclarativeType *declarativeType;
         const QDeclarativeScript::Object *idObject;
     };
-    int index;
+    QDeclarativePropertyData *property;
     Storage storage;
     BuiltinSymbol builtin;
     quint32 line;
@@ -307,7 +307,7 @@ struct Unop: Expr {
 
     void init(AluOp op, Expr *expr)
     {
-        this->typeForOp(op, expr);
+        this->type = this->typeForOp(op, expr);
         this->op = op;
         this->expr = expr;
     }
@@ -531,9 +531,9 @@ struct BasicBlock {
 
     Name *NAME(const QString &id, quint32 line, quint32 column);
     Name *NAME(Name *base, const QString &id, quint32 line, quint32 column);
-    Name *SYMBOL(Type type, const QString &id, const QMetaObject *meta, int index, Name::Storage storage, quint32 line, quint32 column);
-    Name *SYMBOL(Name *base, Type type, const QString &id, const QMetaObject *meta, int index, quint32 line, quint32 column);
-    Name *SYMBOL(Name *base, Type type, const QString &id, const QMetaObject *meta, int index, Name::Storage storage, quint32 line, quint32 column);
+    Name *SYMBOL(Type type, const QString &id, const QMetaObject *meta, QDeclarativePropertyData *property, Name::Storage storage, quint32 line, quint32 column);
+    Name *SYMBOL(Name *base, Type type, const QString &id, const QMetaObject *meta, QDeclarativePropertyData *property, quint32 line, quint32 column);
+    Name *SYMBOL(Name *base, Type type, const QString &id, const QMetaObject *meta, QDeclarativePropertyData *property, Name::Storage storage, quint32 line, quint32 column);
     Name *ID_OBJECT(const QString &id, const QDeclarativeScript::Object *object, quint32 line, quint32 column);
     Name *ATTACH_TYPE(const QString &id, const QDeclarativeType *attachType, Name::Storage storage, quint32 line, quint32 column);