Remove "All rights reserved" line from license headers.

[profile/ivi/qtdeclarative.git] / src / declarative / qml / ftw / qfastmetabuilder.cpp

diff --git a/src/declarative/qml/ftw/qfastmetabuilder.cpp b/src/declarative/qml/ftw/qfastmetabuilder.cpp
index 95de083..0395ab3 100644 (file)
--- a/src/declarative/qml/ftw/qfastmetabuilder.cpp
+++ b/src/declarative/qml/ftw/qfastmetabuilder.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
@@ -35,12 +34,12 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 #include "qfastmetabuilder_p.h"
-#include "qvariant.h"
 
 #include <QtCore/qmetaobject.h>
 
@@ -260,20 +259,16 @@ void QFastMetaBuilder::setProperty(int index, const StringRef &name, const Strin
     QMetaObjectPrivate *p = priv(m_data);
     Q_ASSERT(index < p->propertyCount);
 
-    uint qtType = mtype;
-    if ((int)qtType == qMetaTypeId<QVariant>())
-        qtType = 0xFF; // Special handling for QVariant
-
     uint *ptr = fieldPointer(m_data) + p->propertyData + index * PROPERTY_FIELD_COUNT;
     // properties: name, type, flags
     ptr[0] = name.offset();
     ptr[1] = type.offset();
     if (notifySignal == -1) {
-        ptr[2] = qtType << 24;
+        ptr[2] = mtype << 24;
         ptr[2] |= flags | Scriptable | Readable;
         *(fieldPointer(m_data) + p->propertyData + p->propertyCount * PROPERTY_FIELD_COUNT + index) = 0;
     } else {
-        ptr[2] = qtType << 24;
+        ptr[2] = mtype << 24;
         ptr[2] |= flags | Scriptable | Readable | Notify;
         *(fieldPointer(m_data) + p->propertyData + p->propertyCount * PROPERTY_FIELD_COUNT + index) = notifySignal;
     }