Merge remote-tracking branch 'qt/5.9' into 5.10v5.10.0-beta3

Change-Id: I6c283081669594b3e8c6b30194bb96e389319cb2

1 files changed, 4 insertions, 2 deletions

diff --git a/src/client/qwaylandwlshellsurface.cpp b/src/client/qwaylandwlshellsurface.cpp
index 77434e98b..92223f45e 100644
--- a/src/client/qwaylandwlshellsurface.cpp
+++ b/src/client/qwaylandwlshellsurface.cpp
@@ -185,6 +185,7 @@ void QWaylandWlShellSurface::updateTransientParent(QWindow *parent)
             || testShowWithoutActivating(m_window->window()))
         flags |= WL_SHELL_SURFACE_TRANSIENT_INACTIVE;
 
+    Q_ASSERT(parent_wayland_window->object());
     set_transient(parent_wayland_window->object(),
                   transientPos.x(),
                   transientPos.y(),
@@ -211,15 +212,16 @@ void QWaylandWlShellSurface::setPopup(QWaylandWindow *parent, QWaylandInputDevic
         transientPos.setY(transientPos.y() + parent_wayland_window->decoration()->margins().top());
     }
 
+    Q_ASSERT(parent_wayland_window->object());
     set_popup(device->wl_seat(), serial, parent_wayland_window->object(),
               transientPos.x(), transientPos.y(), 0);
 }
 
 void QWaylandWlShellSurface::setType(Qt::WindowType type, QWaylandWindow *transientParent)
 {
-    if (type == Qt::Popup && transientParent)
+    if (type == Qt::Popup && transientParent && transientParent->object())
         setPopup(transientParent, m_window->display()->lastInputDevice(), m_window->display()->lastInputSerial());
-    else if (transientParent)
+    else if (transientParent && transientParent->object())
         updateTransientParent(transientParent->window());
     else
         setTopLevel();