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

Author: build

platform/ios/wd_qt5_64.gypi

@@ -1,6 +1,8 @@
 {
   'variables': {
     'QT5': '1', # change to '1' for enabling Qt5
+    'WD_BUILD_MONGOOSE': '1',
+    'WD_CONFIG_PLAYER': '0',
     'QT_INC_PATH':    '/usr/local/opt/qt5_ios64/include',
     'QT_LIB_PATH':    '/usr/local/opt/qt5_ios64/lib',
     'QT_BIN_PATH':    '/usr/local/opt/qt5_ios64/bin',

platform/mac/wd_qt4_64.gypi

@@ -0,0 +1,8 @@
+{
+  'variables': {
+    'QT5': '0', # change to '1' for enabling Qt5
+    'QT_BIN_PATH': '/usr/local/opt/qt4_64/bin',
+    'QT_INC_PATH': '/usr/local/opt/qt4_64/include',
+    'QT_LIB_PATH': '/usr/local/opt/qt4_64/lib',
+  },
+}

src/webdriver/extension_qt/qwebviewext.cc

@@ -7,15 +7,18 @@
 #include "webdriver_switches.h"
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 #include <QtWidgets/QWidget>
+#include <QtWebKitWidgets/QWebFrame>
 #else
 #include <QtGui/QWidget>
+#include <QtWebKit/QWebFrame>
 #endif
 
 QWebViewExt::QWebViewExt(QWidget *parent) :
     QWebView(parent)
 {
     setWebInspectorProperty(this);
     connect(page(), SIGNAL(windowCloseRequested()), this, SLOT(close()));
+    connect(this, SIGNAL(titleChanged(QString)), this, SLOT(setWindowTitle(QString)));
 }
 
 QWebViewExt::~QWebViewExt()

src/webdriver/extension_qt/web_view_executor.cc

@@ -840,7 +840,6 @@ void QWebViewCmdExecutor::TouchPinchRotate(const ElementId &element, const int &
     float degree = angle;
     float rad = M_PI*degree/180;
 
-
     QTouchEvent *touchBeginEvent = create2PointTouchEvent(QEvent::TouchBegin, Qt::TouchPointPressed, startPoint, startPoint2);
     QApplication::postEvent(view_, touchBeginEvent);
 
@@ -908,7 +907,7 @@ void QWebViewCmdExecutor::TouchPinchZoom(const ElementId &element, const double
             point2.setX(startPoint2.x() + dx*i/stepCount);
         else
             point2.setX(startPoint2.x() - dx*i/stepCount);
-        qDebug()<<i<<point1<<point2;
+
         QTouchEvent *touchMoveEvent = create2PointTouchEvent(QEvent::TouchUpdate, Qt::TouchPointMoved, point1, point2);
         QApplication::postEvent(view_, touchMoveEvent);
 

web/webdriver-app.js

@@ -450,10 +450,21 @@ VisualizerController.prototype.visualizerAssignEventHandlers = function() {
   });
 
   hammer.on("rotate", function(event) {
+    // get principal angle from the interval (-180, 180)
+    function toPrincipalAngle(angle) {
+      while (angle < 0) angle += 360;
+      angle = angle - Math.round(angle / 360) * 360;
+      if (angle > 180) angle -= 360;
+      return angle;
+    }
+
+    var angle = event.gesture.rotation;
+    angle = Math.round(toPrincipalAngle(angle));
+
     var xpath = Util.getXPath(event.target);
     var target = self.driver.findElement(webdriver.By.xpath(xpath));
     self.driver.actions().
-      touchPinchRotate(target, event.gesture.rotation).
+      touchPinchRotate(target, angle).
       perform();
   });
 
@@ -488,6 +499,7 @@ VisualizerController.prototype.showVisualizationWindow = function(source, size)
   } else {
     var visualizerDoc = this.visualizationWin.document;
     visualizerDoc.write(source);
+    visualizerDoc.title += ' - Visualizer';
   }
 
   this.visualizerAssignEventHandlers();