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

Author: Andrii Boichuk

src/Test/WindowWithDeclarativeViewTest.cc

@@ -16,19 +16,10 @@ WindowWithDeclarativeViewTestWidget::WindowWithDeclarativeViewTestWidget(QWidget
     pLabel->setObjectName("labelStatus");
     pLabel->setVisible(true);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    pView = new QQuickView();
-#else
     pView = new QDeclarativeView();
-#endif
-
     pView->setObjectName("declarativeView");
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    connect(pView, SIGNAL(statusChanged(QQuickView::Status)), this, SLOT(displayStatus()));
-#else
     connect(pView, SIGNAL(statusChanged(QDeclarativeView::Status)), this, SLOT(displayStatus()));
-#endif
 
     QHBoxLayout* hbl = new QHBoxLayout();
     hbl->addWidget(pLineEdit);
@@ -37,12 +28,9 @@ WindowWithDeclarativeViewTestWidget::WindowWithDeclarativeViewTestWidget(QWidget
     QVBoxLayout *vbl = new QVBoxLayout(this);
     vbl->addLayout(hbl);
     vbl->addWidget(pLabel);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    QWidget *container = QWidget::createWindowContainer(pView);
-    vbl->addWidget(container);
-#else
+
     vbl->addWidget(pView);
-#endif
+
     this->setLayout(vbl);
 }
 
@@ -54,17 +42,13 @@ void WindowWithDeclarativeViewTestWidget::loadQML() {
 }
 
 void WindowWithDeclarativeViewTestWidget::displayStatus() {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    if (pView->status() == QQuickView::Ready)
-#else
-    if (pView->status() == QDeclarativeView::Ready)
-#endif
+
+    if (pView->status() == QDeclarativeView::Ready) {
         pLabel->setText("Loading successfully");
+        return;
+    }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    if (pView->status() == QQuickView::Error)
-#else
-    if (pView->status() == QDeclarativeView::Error)
-#endif
+    if (pView->status() == QDeclarativeView::Error) {
         pLabel->setText("Error");
+    }
 }

src/Test/WindowWithDeclarativeViewTest.h

@@ -3,12 +3,7 @@
 
 #include "CommonQtTestHeaders.h"
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-#include <QtQuick/QQuickView>
-#else
 #include <QtDeclarative/QDeclarativeView>
-#endif
-
 
 class WindowWithDeclarativeViewTestWidget : public QWidget
 {
@@ -25,12 +20,8 @@ public slots:
     QPushButton* pButton;
     QLineEdit* pLineEdit;
     QLabel *pLabel;
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    QQuickView *pView;
-#else
     QDeclarativeView *pView;
-#endif
+
 
 };
 

src/Test/WindowWithSeparatedDeclarativeAndWebViewsTest.cc

@@ -0,0 +1,58 @@
+#include "WindowWithSeparatedDeclarativeAndWebViewsTest.h"
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWebKitWidgets/QWebView>
+#else
+#include <QtWebKit/QWebView>
+#endif
+
+#include <QtDeclarative/QDeclarativeView>
+
+WindowWithSeparatedDeclarativeAndWebViewsTestWidget::WindowWithSeparatedDeclarativeAndWebViewsTestWidget(QWidget *parent) :
+    QWidget(parent) {
+    this->setWindowTitle("Test Widget");
+    pLineEditForWeb = new QLineEdit();
+    pLineEditForWeb->setObjectName("inputWebURL");
+    connect(pLineEditForWeb, SIGNAL(returnPressed()), this, SLOT(openWebView()));
+
+    pButtonWeb = new QPushButton("Go to Web!");
+    pButtonWeb->setObjectName("openWebViewButton");
+    connect(pButtonWeb, SIGNAL(clicked()), this, SLOT(openWebView()));
+
+    pLineEditForQml = new QLineEdit();
+    pLineEditForQml->setObjectName("inputQmlURL");
+    connect(pLineEditForQml, SIGNAL(returnPressed()), this, SLOT(openQmlView()));
+
+    pButtonQml = new QPushButton("Go to Qml!");
+    pButtonQml->setObjectName("openQmlViewButton");
+    connect(pButtonQml, SIGNAL(clicked()), this, SLOT(openQmlView()));
+
+    QHBoxLayout* hblweb = new QHBoxLayout();
+    hblweb->addWidget(pLineEditForWeb);
+    hblweb->addWidget(pButtonWeb);
+
+    QHBoxLayout* hblqml = new QHBoxLayout();
+    hblqml->addWidget(pLineEditForQml);
+    hblqml->addWidget(pButtonQml);
+
+    QVBoxLayout* vbl = new QVBoxLayout();
+    vbl->addLayout(hblweb);
+    vbl->addLayout(hblqml);
+    this->setLayout(vbl);
+}
+
+WindowWithSeparatedDeclarativeAndWebViewsTestWidget::~WindowWithSeparatedDeclarativeAndWebViewsTestWidget() {}
+
+void WindowWithSeparatedDeclarativeAndWebViewsTestWidget::openWebView() {
+    QWebView *pWebView = new QWebView;
+    pWebView->setAttribute(Qt::WA_DeleteOnClose);
+    pWebView->load(pLineEditForWeb->text());
+    pWebView->show();
+}
+
+void WindowWithSeparatedDeclarativeAndWebViewsTestWidget::openQmlView() {
+    QDeclarativeView *pView = new QDeclarativeView();
+    pView->setAttribute(Qt::WA_DeleteOnClose);
+    pView->setSource(pLineEditForQml->text());
+    pView->show();
+}

src/Test/WindowWithSeparatedDeclarativeAndWebViewsTest.h

@@ -0,0 +1,25 @@
+#ifndef WINDOWWITHSEPARATEDDECLARATIVEANDWEBVIEWSTEST_H
+#define WINDOWWITHSEPARATEDDECLARATIVEANDWEBVIEWSTEST_H
+
+#include "CommonQtTestHeaders.h"
+
+class WindowWithSeparatedDeclarativeAndWebViewsTestWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit WindowWithSeparatedDeclarativeAndWebViewsTestWidget(QWidget *parent = 0);
+    ~WindowWithSeparatedDeclarativeAndWebViewsTestWidget();
+    
+public slots:
+    void openWebView();
+    void openQmlView();
+
+private:
+    QPushButton* pButtonWeb;
+    QLineEdit* pLineEditForWeb;
+    QPushButton* pButtonQml;
+    QLineEdit* pLineEditForQml;
+    
+};
+
+#endif // WINDOWWITHSEPARATEDDECLARATIVEANDWEBVIEWSTEST_H

src/Test/main.cc

@@ -36,7 +36,10 @@ std::string tests::testDataFolder;
 #include "VisibilityTest.h"
 #include "BasicMouseInterfaceTest.h"
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#include "WindowWithSeparatedDeclarativeAndWebViewsTest.h"
 #include "WindowWithDeclarativeViewTest.h"
+#endif
 
 // Commented VideoTest due to error https://bugreports.qt-project.org/browse/QTBUG-32949
 #ifndef OS_IOS
@@ -132,7 +135,9 @@ int main(int argc, char *argv[])
     widgetCreator->RegisterViewClass<StaleElementReferenceTestWidget>("StaleElementReferenceTestWidget");
     widgetCreator->RegisterViewClass<VisibilityTestWidget>("VisibilityTestWidget");
     widgetCreator->RegisterViewClass<BasicMouseInterfaceTestWidget>("BasicMouseInterfaceTestWidget");
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
     widgetCreator->RegisterViewClass<WindowWithDeclarativeViewTestWidget>("WindowWithDeclarativeViewTestWidget");
+#endif
 
 #ifndef OS_IOS
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
@@ -150,6 +155,9 @@ int main(int argc, char *argv[])
     webdriver::ViewCmdExecutorFactory::GetInstance()->AddViewCmdExecutorCreator(new webdriver::QWebViewCmdExecutorCreator());
     widgetCreator->RegisterViewClass<WindowWithEmbeddedViewTestWidget>("WindowWithEmbeddedViewTestWidget");
     widgetCreator->RegisterViewClass<WidgetAndWebViewTestWindows>("WidgetAndWebViewTestWindows");
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+    widgetCreator->RegisterViewClass<WindowWithSeparatedDeclarativeAndWebViewsTestWidget>("WindowWithSeparatedDeclarativeAndWebViewsTestWidget");
+#endif
 #endif
 
 #ifndef OS_IOS 
@@ -178,7 +186,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<QDeclarativeWebView>("CiscoQtWebKit", 1, 1, "CiscoWebView");
     qmlRegisterRevision<QDeclarativeWebView, 0>("CiscoQtWebKit", 1, 0);
     qmlRegisterRevision<QDeclarativeWebView, 1>("CiscoQtWebKit", 1, 1);
-    webdriver::ViewEnumerator::AddViewEnumeratorImpl(new webdriver::QmlWebViewEnumeratorImpl());    
+    webdriver::ViewEnumerator::AddViewEnumeratorImpl(new webdriver::QmlWebViewEnumeratorImpl());
     webdriver::ViewCmdExecutorFactory::GetInstance()->AddViewCmdExecutorCreator(new webdriver::QmlWebViewCmdExecutorCreator());
     #endif
 

wd_test.gyp

@@ -241,6 +241,9 @@
         '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