diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-09-07 16:43:00 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-09-19 08:58:35 +0000 |
| commit | c7e417e8d552f3a6a10ac12f96119d083f081fc0 (patch) | |
| tree | 770ec7d03aa139aa71ec3bf7c89592144dac7091 /src | |
| parent | 3e5ad6d695f5827096d91cdfe047509e31662fa7 (diff) | |
Warn if using QWaylandClientExtension without a Wayland plugin
Change-Id: Ibbf6acab4af45a6b17089bd3809c33a199dc89f6
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/global/qwaylandclientextension.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/client/global/qwaylandclientextension.cpp b/src/client/global/qwaylandclientextension.cpp index 8992e132f..8e46197f1 100644 --- a/src/client/global/qwaylandclientextension.cpp +++ b/src/client/global/qwaylandclientextension.cpp @@ -39,7 +39,9 @@ #include <QtWaylandClient/private/qwaylanddisplay_p.h> #include <QtWaylandClient/private/qwaylandintegration_p.h> #include <QtGui/QGuiApplication> +#include <QtGui/qpa/qplatformnativeinterface.h> #include <QtGui/private/qguiapplication_p.h> +#include <QtCore/QDebug> QT_BEGIN_NAMESPACE @@ -54,6 +56,9 @@ QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate() waylandIntegration = static_cast<QtWaylandClient::QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration()); if (!waylandIntegration) waylandIntegration = new QtWaylandClient::QWaylandIntegration(); + + if (!waylandIntegration->nativeInterface()->nativeResourceForIntegration("wl_display")) + qWarning() << "This application requires a Wayland platform plugin"; } void QWaylandClientExtensionPrivate::handleRegistryGlobal(void *data, ::wl_registry *registry, uint32_t id, |