diff options
| author | Shawn Rutledge <shawn.rutledge@theqtcompany.com> | 2015-12-16 08:50:24 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-02-29 14:12:39 +0000 |
| commit | c952fda6be930348df330e21d874aa8a5d3e94e8 (patch) | |
| tree | 1a0cfa98f04c966f48712ea8d7d3f3e5a6823931 /src/compositor/compositor_api/qwaylandcompositor.cpp | |
| parent | 9a2ad1442bd83bcd90c247e69ae681fc2a170821 (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>
(cherry picked from commit 01a967af0e8034851000bde640774c008939175c)
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 3 |
1 files changed, 2 insertions, 1 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)); |