JavaScript expression can find QML element by objectName: Qt4 support

Author: hekra

build.sh

@@ -22,7 +22,7 @@ else
 fi
 if [ -z $mode ];
 then
-  modes="release_dbg release"
+  modes="release"
 else
   modes=$mode
 fi

src/webdriver/extension_qt/qml_objname_util.cc

@@ -23,7 +23,11 @@
 
 namespace webdriver {
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 ObjectNameUtils::ObjectNameUtils(QQuickItem *root) : root_(root) {}
+#else
+ObjectNameUtils::ObjectNameUtils(QDeclarativeItem *root) : root_(root) {}
+#endif
 ObjectNameUtils::~ObjectNameUtils() {}
 
 QObject *ObjectNameUtils::findChild(const QString& name) {

src/webdriver/extension_qt/qml_objname_util.h

@@ -22,8 +22,12 @@
 
 #include <string>
 #include <QtCore/QDebug>
-#include <QtQuick/QQuickItem>
 #include "common_util.h"
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtQuick/QQuickItem>
+#else
+#include <QtDeclarative/QDeclarativeItem>
+#endif
 
 namespace webdriver {
 
@@ -32,16 +36,36 @@ class ObjectNameUtils
 {
     Q_OBJECT
 public:
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
     ObjectNameUtils(QQuickItem *root);
+#else
+    ObjectNameUtils(QDeclarativeItem *root);
+#endif
     ~ObjectNameUtils();
     Q_INVOKABLE QObject *findChild(const QString& name);
 protected:
-    QQuickItem* root_;
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    QQuickItem *root_;
+
+    QObject *findChild(QQuickItem *item, const QString& name) {
+        if (name == item->objectName())
+            return item;
 
-    QObject * findChild(const QQuickItem* item, const QString& name) {
         QList<QQuickItem*> childs = item->childItems();
 
         foreach(QQuickItem *child, childs) {
+#else
+    QDeclarativeItem *root_;
+
+    QObject *findChild(QDeclarativeItem *item, const QString& name) {
+        if (name == item->objectName())
+            return item;
+
+        QList<QGraphicsItem*> childs = item->childItems();
+
+        foreach(QGraphicsItem *gchild, childs) {
+            QDeclarativeItem *child = qobject_cast<QDeclarativeItem*>(gchild);
+#endif
             if (!child) continue;
             if (name == child->objectName())
                return child;

src/webdriver/extension_qt/qml_view_executor.cc

@@ -31,6 +31,7 @@
 #include "extension_qt/widget_element_handle.h"
 #include "extension_qt/widget_view_handle.h"
 #include "qml_view_util.h"
+#include "qml_objname_util.h"
 
 #include <QtCore/QBuffer>
 #include <QtCore/QDebug>
@@ -39,6 +40,7 @@
 
 #include <QtDeclarative/QDeclarativeExpression>
 #include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 
 #include "third_party/pugixml/pugixml.hpp"
 
@@ -791,7 +793,16 @@ void QQmlViewCmdExecutor::ExecuteScript(const std::string& script, const base::L
         script.c_str(),
         args_as_json.c_str());
 
-    QDeclarativeExpression expr(view->engine()->rootContext(), view->rootObject(), jscript.c_str());
+    QDeclarativeContext *rootContext = view->rootContext();
+    QVariant p = rootContext->contextProperty("ObjectNameUtils");
+
+    if (p.isNull()) {
+        QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(view->rootObject());
+        ObjectNameUtils* objn = new ObjectNameUtils(rootItem);
+        rootContext->setContextProperty("ObjectNameUtils", objn);
+    }
+
+    QDeclarativeExpression expr(rootContext, view->rootObject(), jscript.c_str());
     QVariant result = expr.evaluate();
     if (expr.hasError()) {
         *error = new Error(kJavaScriptError, expr.error().toString().toStdString());

wd_ext_qt.gyp

@@ -121,6 +121,9 @@
             'src/webdriver/extension_qt/qml_view_enumerator.cc',
             'src/webdriver/extension_qt/qml_view_executor.cc',
             'src/webdriver/extension_qt/qml_view_util.cc',
+            'src/webdriver/extension_qt/qml_objname_util.h',
+            'src/webdriver/extension_qt/qml_objname_util.cc',
+            '<(INTERMEDIATE_DIR)/moc_qml_objname_util.cc',
           ],
         } ],