Merge branch 'WD_1.X_dev' of https://portal-ua.globallogic.com/git/wd into WD_1.X_dev

Author: Andrii Moroz

inc/extension_qt/q_view_executor.h

@@ -38,6 +38,7 @@ class QViewCmdExecutor : public ViewCmdExecutor {
     virtual void SendKeys(const string16& keys, Error** error);
     virtual void Close(Error** error);
     virtual void SwitchTo(Error** error);
+    virtual void FindElement(const ElementId& root_element, const std::string& locator, const std::string& query, ElementId* element, Error** error);
     virtual void GetAlertMessage(std::string* text, Error** error);
     virtual void SetAlertPromptText(const std::string& alert_prompt_text, Error** error);
     virtual void AcceptOrDismissAlert(bool accept, Error** error);

inc/extension_qt/widget_view_executor.h

@@ -60,7 +60,6 @@ class QWidgetViewCmdExecutor : public QViewCmdExecutor {
     virtual void ElementSubmit(const ElementId& element, Error** error) NOT_SUPPORTED_IMPL;
     virtual void GetElementText(const ElementId& element, std::string* element_text, Error** error);
     virtual void GetElementCssProperty(const ElementId& element, const std::string& property, base::Value** value, Error** error) NOT_SUPPORTED_IMPL;
-    virtual void FindElement(const ElementId& root_element, const std::string& locator, const std::string& query, ElementId* element, Error** error);
     virtual void FindElements(const ElementId& root_element, const std::string& locator, const std::string& query, std::vector<ElementId>* elements, Error** error);
     virtual void ActiveElement(ElementId* element, Error** error);
     virtual void SwitchToFrameWithNameOrId(const std::string& name_or_id, Error** error) NOT_SUPPORTED_IMPL;

src/webdriver/extension_qt/q_view_executor.cc

@@ -75,6 +75,11 @@ void QViewCmdExecutor::SetBounds(const Rect& bounds, Error** error) {
     if (NULL == view)
         return;
 
+    if (!view->isTopLevel()) {
+        *error = new Error(kUnknownError, "Cant set bounds to non top level view.");
+        return;
+    }
+
     view->setGeometry(ConvertRectToQRect(bounds));
 }
 
@@ -185,6 +190,15 @@ void QViewCmdExecutor::SwitchTo(Error** error) {
     session_->logger().Log(kInfoLogLevel, "SwitchTo - set current view ("+view_id_.id()+")");
 }
 
+void QViewCmdExecutor::FindElement(const ElementId& root_element, const std::string& locator, const std::string& query, ElementId* element, Error** error) {
+    std::vector<ElementId> elements;
+    FindElements(root_element, locator, query, &elements, error);
+    if (*error == NULL && !elements.empty())
+        *element = elements[0];
+    else if(*error == NULL)
+        *error = new Error(kNoSuchElement);
+}
+
 void QViewCmdExecutor::GetAlertMessage(std::string* text, Error** error) {
     QWidget* view = getView(view_id_, error);
     if (NULL == view)

src/webdriver/extension_qt/widget_view_executor.cc

@@ -723,19 +723,6 @@ void QWidgetViewCmdExecutor::GetElementText(const ElementId& element, std::strin
     *error = new Error(kNoSuchElement);
 }
 
-void QWidgetViewCmdExecutor::FindElement(const ElementId& root_element, const std::string& locator, const std::string& query, ElementId* element, Error** error) {
-	QWidget* view = getView(view_id_, error);
-    if (NULL == view)
-        return;
-
-    std::vector<ElementId> elements;
-    FindElements(root_element, locator, query, &elements, error);
-    if (*error == NULL && elements.size() != 0)
-        *element = elements[0];
-    else if(*error == NULL)
-        *error = new Error(kNoSuchElement);
-}
-
 void QWidgetViewCmdExecutor::FindElements(const ElementId& root_element, const std::string& locator, const std::string& query, std::vector<ElementId>* elements, Error** error) {
 	QWidget* view = getView(view_id_, error);
     if (NULL == view)

wd.gypi.merged_sample

@@ -0,0 +1,15 @@
+{
+  'variables': {
+    'QT5':                      '0', # change to '1' for enabling Qt5
+    'WD_BUILD_MONGOOSE':        '0',
+    'WD_BUILD_MODP_B64':        '1',
+    'DESKTOP_QT_BIN_PATH':      '/usr/lib/qt4/bin',
+    'DESKTOP_QT_INC_PATH':      '/usr/include',
+    'DESKTOP_QT_LIB_PATH':      '/usr/lib',
+    'CISCO_QT_INC_PATH':        '<(ROOT_PATH)/WEBKITQT48_SRC/dist/<(platform)/<(mode)/include',
+    'CISCO_QT_LIB_PATH':        '<(ROOT_PATH)/WEBKITQT48_SRC/dist/<(platform)/<(mode)/lib/',
+    'CISCO_QT_BIN_PATH':        '<(ROOT_PATH)/WEBKITQT48_SRC/dist/<(platform)/<(mode)/bin/',
+    'CISCO_MONGOOSE_LIB_PATH':  '<(ROOT_PATH)/MONGOOSE/dist/<(platform)/generic/<(mode)/lib',
+    'CISCO_MONGOOSE_INC_PATH':  '<(ROOT_PATH)/MONGOOSE/dist/<(platform)/generic/<(mode)/h',
+  },
+}

wd.gypi.sample

@@ -2,9 +2,6 @@
 {
   'variables': {
     'QT5': '0', # change to '1' for enabling Qt5
-    'WD_CONFIG_QWIDGET_VIEW': '1',
-    'WD_CONFIG_QWIDGET_VIEW_ACCESSABILITY': '0',
-    'WD_CONFIG_QML_VIEW': '1',
     'WD_BUILD_MONGOOSE': '1',
     'WD_BUILD_MODP_B64': '1',
     'CISCO_QT_BIN_PATH':   '/opt/qt4_nds/linux2_2/release/bin/',