replace QQuickView by QQuickWindow

Author: hekra

inc/extension_qt/quick2_view_executor.h

@@ -26,6 +26,7 @@
 #include <QtCore/QXmlStreamWriter>
 #include <QtQuick/QQuickView>
 #include <QtQuick/QQuickItem>
+#include <QtQuick/QQuickWindow>
 
 namespace webdriver {
 
@@ -137,15 +138,15 @@ class Quick2ViewCmdExecutor : public QWindowViewCmdExecutor {
     virtual void IsOnline(bool*, Error** error) NOT_SUPPORTED_IMPL;
 
 protected:
-    QQuickView* getView(const ViewId& viewId, Error** error);
+    QQuickWindow* getView(const ViewId& viewId, Error** error);
     typedef QHash<QString, QQuickItem*> XMLElementMap;    
 
     QQuickItem* getElement(const ElementId &element, Error** error);
-    QQuickItem* getFocusItem(QQuickView* view);
+    QQuickItem* getFocusItem(QQuickWindow* view);
     bool FilterElement(const QQuickItem* item, const std::string& locator, const std::string& query);
     void FindElementsByXpath(QQuickItem* parent, const std::string &query, std::vector<ElementId>* elements, Error **error);
     void FindElements(QQuickItem* parent, const std::string& locator, const std::string& query, std::vector<ElementId>* elements, Error** error);
-    void moveMouseInternal(QQuickView* view, QPointF& point);
+    void moveMouseInternal(QQuickWindow* view, QPointF& point);
 
 private:
     DISALLOW_COPY_AND_ASSIGN(Quick2ViewCmdExecutor);

src/Test/Headers.h

@@ -164,7 +164,7 @@ int wd_setup(int argc, char *argv[])
 #elif defined(OS_POSIX)
     cmd_line.InitFromArgv(argc, argv);
 #endif
-
+cmd_line.AppendSwitch("verbose");
 #ifndef QT_NO_SAMPLES
     /* optional samples setup */
     wd_samples_setup(widgetCreator, webCreator, qmlCreator, cmd_line);

src/webdriver/extension_qt/qml_view_util.cc

@@ -94,7 +94,7 @@ QWindow* QQmlViewUtil::getQWindowView(Session* session, const ViewId& viewId) {
     return qobject_cast<QWindow*>(qViewHandle->get());
 }
 
-QQuickView* QQmlViewUtil::getQMLView(Session* session, const ViewId& viewId) {
+QQuickWindow* QQmlViewUtil::getQMLView(Session* session, const ViewId& viewId) {
     ViewHandle* viewHandle =  session->GetViewHandle(viewId);
     if (NULL == viewHandle) 
         return NULL;
@@ -103,8 +103,68 @@ QQuickView* QQmlViewUtil::getQMLView(Session* session, const ViewId& viewId) {
     if (NULL == qViewHandle)
         return NULL;
 
-    return qobject_cast<QQuickView*>(qViewHandle->get());
+    return qobject_cast<QQuickWindow*>(qViewHandle->get());
 }
+
+QQmlEngine* QQmlViewUtil::getQMLEngine(QQuickWindow* qquickWindow) {
+    QQuickView* pView = qobject_cast<QQuickView*>(qquickWindow);
+
+    if (pView != NULL)
+        return pView->engine();
+
+    QQuickWindow* pWin = qobject_cast<QQuickWindow*>(qquickWindow);
+ 
+    if (pView != NULL) {
+        QQuickItem* item =  pWin->contentItem();
+        return  QQmlEngine::contextForObject(item)->engine();
+    }
+
+    return NULL;
+}
+
+void QQmlViewUtil::setSource(const QUrl &url, bool sync, QQuickWindow* qquickWindow) {
+    QQuickView* pView = qobject_cast<QQuickView*>(qquickWindow);
+
+    if (pView != NULL) {
+        if (sync) {
+            QEventLoop loop;
+            QObject::connect(pView, SIGNAL(statusChanged(QQuickView::Status)),&loop,SLOT(quit()));
+            pView->setSource(url);
+
+            if (QQuickView::Loading == pView->status()) {
+                loop.exec();
+            }
+        } else {
+            pView->setSource(url);
+        }
+    }
+    else {
+        // TODO async / sync mode
+        QQmlEngine* engine = QQmlViewUtil::getQMLEngine(qquickWindow);
+        QQmlApplicationEngine* appEngine = qobject_cast<QQmlApplicationEngine*>(engine);
+
+        if (appEngine != NULL) {
+            appEngine->load(url);
+        }
+    }
+}
+
+const QUrl QQmlViewUtil::getSource(QQuickWindow* qquickWindow) {
+    QQuickView* pView = qobject_cast<QQuickView*>(qquickWindow);
+
+    if (pView != NULL) {
+        return pView->source();
+    }
+
+    QQmlEngine* engine = QQmlViewUtil::getQMLEngine(qquickWindow);
+    QQmlApplicationEngine* appEngine = qobject_cast<QQmlApplicationEngine*>(engine);
+
+    if (appEngine != NULL) {
+        return appEngine->baseUrl();
+    }
+    return QUrl();
+}
+
 #else
 void QQmlViewUtil::removeInternalSuffixes(QString& str) {
     str.remove(QRegExp(QLatin1String("_QMLTYPE_\\d+")));

src/webdriver/extension_qt/qml_view_util.h

@@ -30,6 +30,8 @@
 class QWindow;
 class QQuickView;
 #include <QtQuick/QQuickItem>
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlApplicationEngine>
 #else
 class QDeclarativeView;
 #include <QtDeclarative/QDeclarativeItem>
@@ -49,7 +51,10 @@ class QQmlViewUtil {
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
     static QWindow* getQWindowView(Session* session, const ViewId& viewId);
-    static QQuickView* getQMLView(Session* session, const ViewId& viewId);
+    static QQuickWindow* getQMLView(Session* session, const ViewId& viewId);
+    static QQmlEngine* getQMLEngine(QQuickWindow* qquickWindow);
+    static void setSource(const QUrl &url, bool sync, QQuickWindow* qquickWindow);
+    static const QUrl getSource(QQuickWindow* qquickWindow);
 #else    
     static QDeclarativeView* getQMLView(Session* session, const ViewId& viewId);
 #endif

src/webdriver/extension_qt/quick2_view_enumerator.cc

@@ -29,6 +29,7 @@
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlEngine>
 #include <QtQuick/QQuickView>
+#include <QtQuick/QQuickWindow>
 
 namespace webdriver {
 
@@ -37,13 +38,23 @@ void Quick2ViewEnumeratorImpl::EnumerateViews(Session* session, std::set<ViewId>
 
     foreach(QWindow* pWindow, QGuiApplication::allWindows())
     {
+        session->logger().Log(kInfoLogLevel,
+                       "Quick2ViewEnumerator found new view ");
         if (!pWindow->isVisible()) continue;
+        session->logger().Log(kInfoLogLevel,
+                       "Quick2ViewEnumerator found new view visible ");
 
-        QQuickView* pView = qobject_cast<QQuickView*>(pWindow);
+        QQuickWindow* pView = qobject_cast<QQuickWindow*>(pWindow);
         if (pView != NULL) {
+            session->logger().Log(kInfoLogLevel,
+                       "Quick2ViewEnumerator found new view QQuickWindow ");
+
             ViewHandlePtr handle(new QWindowViewHandle(pView));
             ViewId viewId = session->GetViewForHandle(handle);
             if (!viewId.is_valid()) {
+                session->logger().Log(kInfoLogLevel,
+                        "Quick2ViewEnumerator found new view is_valid");
+
                 if (session->AddNewView(handle, &viewId))  {
                     session->logger().Log(kInfoLogLevel,
                         "Quick2ViewEnumerator found new view("+viewId.id()+")");