qml: getattribute(id)

Author: AndriyP

src/webdriver/extension_qt/qml_view_executor.cc

@@ -439,6 +439,13 @@ void QQmlViewCmdExecutor::GetAttribute(const ElementId& element, const std::stri
         return;
 
     QVariant propertyValue = pItem->property(key.c_str());
+
+    // substituate "id" with "objectName"
+    QString idName("id");
+    if (0 == idName.compare(key.c_str(), Qt::CaseInsensitive)) {
+        propertyValue = pItem->property("objectName");
+    }
+    
     Value* val = NULL;
 
     if (propertyValue.isValid()) {

src/webdriver/extension_qt/qml_web_view_executor.cc

@@ -695,7 +695,7 @@ void QmlWebViewCmdExecutor::SetMute(const ElementId& element, bool mute, Error**
 void QmlWebViewCmdExecutor::GetMute(const ElementId& element, bool* mute, Error** error) {
     CHECK_VIEW_EXISTANCE
 
-            *error = webkitProxy_->GetMute(element, mute);
+    *error = webkitProxy_->GetMute(element, mute);
 }
 
 void QmlWebViewCmdExecutor::SetPlaybackSpeed(const ElementId &element, double speed, Error **error)

src/webdriver/extension_qt/quick2_view_executor.cc

@@ -451,6 +451,12 @@ void Quick2ViewCmdExecutor::GetAttribute(const ElementId& element, const std::st
 
     QVariant propertyValue = pItem->property(key.c_str());
 
+    // substituate "id" with "objectName"
+    QString idName("id");
+    if (0 == idName.compare(key.c_str(), Qt::CaseInsensitive)) {
+        propertyValue = pItem->property("objectName");
+    }
+
     Value* val = NULL;
 
     if (propertyValue.isValid()) {