1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warn if using QWaylandClientExtension without a Wayland plugin

Browse Source 
Change-Id: Ibbf6acab4af45a6b17089bd3809c33a199dc89f6
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
This commit is contained in:
Johan Klokkhammer Helsing 2016-09-07 16:43:00 +02:00 committed by Johan Helsing
parent 00a0d843d2
commit 56ea738c6d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
View File

@ -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,