remove WindowWithDeclarativeViewTest for qt5

Author: nataliakoval

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/main.cc

@@ -36,7 +36,9 @@ std::string tests::testDataFolder;
 #include "VisibilityTest.h"
 #include "BasicMouseInterfaceTest.h"
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
 #include "WindowWithDeclarativeViewTest.h"
+#endif
 
 // Commented VideoTest due to error https://bugreports.qt-project.org/browse/QTBUG-32949
 #ifndef OS_IOS
@@ -132,7 +134,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))
@@ -178,7 +182,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