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

Author: Andrii Boichuk

src/Test/shutdown_command.cc

@@ -2,7 +2,6 @@
 #include <iostream>
 #include "webdriver_server.h"
 
-#include <QtGui/QApplication>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
     #include <QtConcurrent/QtConcurrentRun>
     #include <QtWidgets/QApplication>

src/webdriver/webdriver_session.cc

@@ -406,11 +406,14 @@ void Session::RemoveView(const ViewId& viewId) {
 
 void Session::UpdateViews(const std::set<ViewId>& views) {
     ViewsMap::iterator it;
+    ViewId vi;
 
     for (it = views_.begin(); it != views_.end(); ++it) {
-        if (0 == views.count(ViewId(it->first))) {
+        vi = ViewId(it->first);
+		
+        if (vi.is_valid() && 0 == views.count(vi)) {
             // invalidate handle
-            RemoveView(ViewId(it->first));
+            RemoveView(vi);
         }
     }
 }

src/webdriver/webdriver_view_enumerator.cc

@@ -19,7 +19,7 @@ void ViewEnumerator::EnumerateViews(Session* session, std::vector<ViewId>* views
 	std::copy(views_set.begin(), views_set.end(), std::back_inserter(*views));
 
 	// update session to remove dangling sessionIds
-	session->logger().Log(kFineLogLevel, base::StringPrintf("EnumerateViews found %d views.", views_set.size()));
+	session->logger().Log(kFineLogLevel, base::StringPrintf("EnumerateViews found %d views.", (int)views_set.size()));
 	session->UpdateViews(views_set);
 }
 

wd_build_options.gypi

@@ -77,9 +77,13 @@
         'action':      ['mkdir', '-p', '<(INTERMEDIATE_DIR)'],                                                                                                  
        } ],
 
-       'defines': [
+      'defines': [ 
          'OS_POSIX',
-       ],
-     } ],
+      ],
+
+      'xcode_settings': {	
+        'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
+      },
+    } ],
   ],
 }