diff options
| author | Giulio Camuffo <giulio.camuffo@kdab.com> | 2016-03-30 12:54:35 +0300 |
|---|---|---|
| committer | Giulio Camuffo <giulio.camuffo@kdab.com> | 2016-04-05 11:11:31 +0000 |
| commit | 9da7a0649cfa65c784e86cf3496b188c9d8d15c4 (patch) | |
| tree | ecd32f8c421fbc90581d265489d3af6adeb5952d | |
| parent | 6d72c4ce5a6948d4c495b3d7560a7449a40917c0 (diff) | |
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>
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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); |