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

Author: Andrii Boichuk

src/Test/main.cc

@@ -37,7 +37,6 @@ std::string tests::testDataFolder;
 #include "BasicMouseInterfaceTest.h"
 
 #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-#include "WindowWithSeparatedDeclarativeAndWebViewsTest.h"
 #include "WindowWithDeclarativeViewTest.h"
 #endif
 
@@ -82,6 +81,9 @@ std::string tests::testDataFolder;
 #include "extension_qt/qwebviewext.h"
 #include "WindowWithEmbeddedViewTest.h"
 #include "WidgetAndWebViewTest.h"
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#include "WindowWithSeparatedDeclarativeAndWebViewsTest.h"
+#endif
 #endif
 
 #include "extension_qt/q_view_runner.h"

wd_test.gyp

@@ -241,9 +241,6 @@
         'src/Test/WindowWithDeclarativeViewTest.cc',
         'src/Test/WindowWithDeclarativeViewTest.h',
         '<(INTERMEDIATE_DIR)/moc_WindowWithDeclarativeViewTest.cc',
-        'src/Test/WindowWithSeparatedDeclarativeAndWebViewsTest.cc',
-        'src/Test/WindowWithSeparatedDeclarativeAndWebViewsTest.h',
-        '<(INTERMEDIATE_DIR)/moc_WindowWithSeparatedDeclarativeAndWebViewsTest.cc',
       ],
       'conditions': [
         # IGNORE VideoTest due to error https://bugreports.qt-project.org/browse/QTBUG-32949
@@ -282,6 +279,9 @@
         'src/Test/WidgetAndWebViewTest.cc',
         'src/Test/WidgetAndWebViewTest.h',
         '<(INTERMEDIATE_DIR)/moc_WidgetAndWebViewTest.cc',
+        'src/Test/WindowWithSeparatedDeclarativeAndWebViewsTest.cc',
+        'src/Test/WindowWithSeparatedDeclarativeAndWebViewsTest.h',
+        '<(INTERMEDIATE_DIR)/moc_WindowWithSeparatedDeclarativeAndWebViewsTest.cc',
       ],
 
       'conditions': [