Fix objectName test in tst_qdeclarativeecmascript.

The QtQuick1 library relied on special case handling of the
objectName property in qtbase. With Qt5, there is a normal
notify signal for objectNameChanged. Remove the QtQuick1
special cases and fall through to the default code path.

Task-number: QTBUG-26334
Change-Id: I70f31947b6c74c7125d6f99a33e9b02d7ef52273
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

1 files changed, 0 insertions, 9 deletions

diff --git a/src/declarative/qml/qdeclarativefastproperties.cpp b/src/declarative/qml/qdeclarativefastproperties.cpp
index ff2ae9d6..4fa53dfb 100644
--- a/src/declarative/qml/qdeclarativefastproperties.cpp
+++ b/src/declarative/qml/qdeclarativefastproperties.cpp
@@ -51,19 +51,10 @@ QT_BEGIN_NAMESPACE
 // primarily read from bindings is a candidate for inclusion as a fast 
 // property.
 
-static void QObject_objectName(QObject *object, void *output, QDeclarativeNotifierEndpoint *endpoint)
-{
-    if (endpoint) 
-        endpoint->connect(QDeclarativeData::get(object, true)->objectNameNotifier());
-    *((QString *)output) = object->objectName();
-}
-
 QDeclarativeFastProperties::QDeclarativeFastProperties()
 {
     add(&QDeclarativeItem::staticMetaObject, QDeclarativeItem::staticMetaObject.indexOfProperty("parent"),
         QDeclarativeItemPrivate::parentProperty);
-    add(&QObject::staticMetaObject, QObject::staticMetaObject.indexOfProperty("objectName"),
-        QObject_objectName);    
 }
 
 int QDeclarativeFastProperties::accessorIndexForProperty(const QMetaObject *metaObject, int propertyIndex)