From b6dc12bbb5059441363dcea3bcae94d17da482ec Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Tue, 14 Jul 2015 02:37:26 -0700
Subject: Move loadVisuallyCommitted signal to the test support API

Change-Id: I877bbd8bc5c710370f135a27bcd7f0f7c95a7292
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/webengine/api/qquickwebengineview.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/webengine/api/qquickwebengineview.cpp')

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 25c4d28ed..066a45d07 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -420,7 +420,10 @@ void QQuickWebEngineViewPrivate::loadCommitted()
 
 void QQuickWebEngineViewPrivate::loadVisuallyCommitted()
 {
-    Q_EMIT e->loadVisuallyCommitted();
+#ifdef ENABLE_QML_TESTSUPPORT_API
+    if (m_testSupport)
+        Q_EMIT m_testSupport->loadVisuallyCommitted();
+#endif
 }
 
 Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<int>(QQuickWebEngineView::NoErrorDomain));
-- 
cgit v1.2.1


From 9da7a0649cfa65c784e86cf3496b188c9d8d15c4 Mon Sep 17 00:00:00 2001
From: Giulio Camuffo <giulio.camuffo@kdab.com>
Date: Wed, 30 Mar 2016 12:54:35 +0300
Subject: Fix trying to open multiple windows if not supported

We shouldn't special case some platform integration names, instead
check if it supports the proper capabilities

Change-Id: Ib8a28a974a4054cea4fbfb503be7c0e0f797e242
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 src/webengine/api/qquickwebengineview.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/webengine/api/qquickwebengineview.cpp')

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 066a45d07..1e3efd6c4 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -77,6 +77,8 @@
 #include <QScreen>
 #include <QUrl>
 #include <QTimer>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformintegration.h>
 #ifndef QT_NO_ACCESSIBILITY
 #include <private/qquickaccessibleattached_p.h>
 #endif // QT_NO_ACCESSIBILITY
@@ -164,7 +166,7 @@ RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHo
 RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegateForPopup(RenderWidgetHostViewQtDelegateClient *client)
 {
     Q_Q(QQuickWebEngineView);
-    const bool hasWindowCapability = qApp->platformName().toLower() != QLatin1String("eglfs");
+    const bool hasWindowCapability = QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::MultipleWindows);
     RenderWidgetHostViewQtDelegateQuick *quickDelegate = new RenderWidgetHostViewQtDelegateQuick(client, /*isPopup = */ true);
     if (hasWindowCapability) {
         RenderWidgetHostViewQtDelegateQuickWindow *wrapperWindow = new RenderWidgetHostViewQtDelegateQuickWindow(quickDelegate);
-- 
cgit v1.2.1