diff options
| author | Shawn Rutledge <shawn.rutledge@theqtcompany.com> | 2015-12-16 08:50:24 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@theqtcompany.com> | 2016-01-05 13:52:28 +0000 |
| commit | 01a967af0e8034851000bde640774c008939175c (patch) | |
| tree | aab0ae957a82983c45b3c4254793c29856529a45 /src/compositor | |
| parent | 2e27de456efb2c6a152cb60f254fbccb9c203a7e (diff) | |
update plugins.qmltypes
This requires a couple of null pointer checks because of the platform
plugin that qmlplugindump uses.
Change-Id: Icb7c0ac1c71ddf69f6c3d9e0013dd6b5e2ef5ab9
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 3 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index a431cdde8..9aec337bd 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -138,7 +138,8 @@ QWaylandCompositorPrivate::QWaylandCompositorPrivate(QWaylandCompositor *composi , retainSelection(false) , initialized(false) { - display = static_cast<wl_display*>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("server_wl_display")); + if (QGuiApplication::platformNativeInterface()) + display = static_cast<wl_display*>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("server_wl_display")); if (!display) display = wl_display_create(); eventHandler.reset(new QtWayland::WindowSystemEventHandler(compositor)); diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index 3ac791eb2..9391164cf 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -452,7 +452,7 @@ bool QWaylandSurface::isInitialized() const QWaylandClient *QWaylandSurface::client() const { Q_D(const QWaylandSurface); - if (isDestroyed() || !compositor()->clients().contains(d->client)) + if (isDestroyed() || !compositor() || !compositor()->clients().contains(d->client)) return Q_NULLPTR; return d->client; |