fix prev commit for QT5

Author: nataliakoval

src/Test/WindowWithEmbeddedViewTest.cc

@@ -1,5 +1,11 @@
 #include "WindowWithEmbeddedViewTest.h"
-#include <QtWebKit/QWebView>
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWebKitWidgets/QWebView>
+#else
+#include <QtWebKit/QtWebKit>
+#endif
+
 
 WindowWithEmbeddedViewTestWidget::WindowWithEmbeddedViewTestWidget(QWidget *parent) :
     QWidget(parent)

src/Test/main.cc

@@ -77,17 +77,6 @@ int main(int argc, char *argv[])
 
     webdriver::ViewTransitionManager::SetURLTransitionAction(new webdriver::URLTransitionAction_CloseOldView());
 
-#if (WD_TEST_ENABLE_WEB_VIEW == 1)    
-    webdriver::ViewCreator* webCreator = new webdriver::QWebViewCreator();
-    webCreator->RegisterViewClass<QWebViewExt>("QWebViewExt");
-    webdriver::ViewFactory::GetInstance()->AddViewCreator(webCreator);
-
-    webdriver::ViewEnumerator::AddViewEnumeratorImpl(new webdriver::WebViewEnumeratorImpl());
-
-    webdriver::ViewCmdExecutorFactory::GetInstance()->AddViewCmdExecutorCreator(new webdriver::QWebViewCmdExecutorCreator());
-
-#endif    
-
     webdriver::ViewCreator* widgetCreator = new webdriver::QWidgetViewCreator();
     widgetCreator->RegisterViewClass<QWidget>("QWidget");
     widgetCreator->RegisterViewClass<WindowTestWidget>("WindowTestWidget");
@@ -105,8 +94,19 @@ int main(int argc, char *argv[])
     widgetCreator->RegisterViewClass<StaleElementReferenceTestWidget>("StaleElementReferenceTestWidget");
     widgetCreator->RegisterViewClass<VisibilityTestWidget>("VisibilityTestWidget");
     widgetCreator->RegisterViewClass<BasicMouseInterfaceTestWidget>("BasicMouseInterfaceTestWidget");
+
+#if (WD_TEST_ENABLE_WEB_VIEW == 1)
+    webdriver::ViewCreator* webCreator = new webdriver::QWebViewCreator();
+    webCreator->RegisterViewClass<QWebViewExt>("QWebViewExt");
+    webdriver::ViewFactory::GetInstance()->AddViewCreator(webCreator);
+
+    webdriver::ViewEnumerator::AddViewEnumeratorImpl(new webdriver::WebViewEnumeratorImpl());
+
+    webdriver::ViewCmdExecutorFactory::GetInstance()->AddViewCmdExecutorCreator(new webdriver::QWebViewCmdExecutorCreator());
     widgetCreator->RegisterViewClass<WindowWithEmbeddedViewTestWidget>("WindowWithEmbeddedViewTestWidget");
 
+
+#endif
     webdriver::ViewFactory::GetInstance()->AddViewCreator(widgetCreator);
 
     webdriver::ViewEnumerator::AddViewEnumeratorImpl(new webdriver::WidgetViewEnumeratorImpl());

wd_test.gyp

@@ -44,7 +44,8 @@
               '-licuuc',
               '-licudata',
               '-licui18n',
-              '-lQt5WebKit',
+#              '-lQt5WebKit',
+              '-lQt5WebKitWidgets',
             ],
           } ],
           ['OS=="win"', {
@@ -184,9 +185,6 @@
         'src/Test/RestyledLabel.cc',
         'src/Test/DragableWidget.cc',
         'src/Test/BasicMouseInterfaceTest.cc',
-        'src/Test/WindowWithEmbeddedViewTest.cc',
-        'src/Test/WindowWithEmbeddedViewTest.h',
-        '<(INTERMEDIATE_DIR)/moc_WindowWithEmbeddedViewTest.cc'
       ],
 
     }, {
@@ -208,6 +206,9 @@
       'sources': [
         'src/Test/main.cc',
         'src/Test/shutdown_command.cc',
+        'src/Test/WindowWithEmbeddedViewTest.cc',
+        'src/Test/WindowWithEmbeddedViewTest.h',
+        '<(INTERMEDIATE_DIR)/moc_WindowWithEmbeddedViewTest.cc',
       ],
 
       'conditions': [