Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	.qmake.conf

Change-Id: Ia0f9d099e92a40cae7ec506781f70c56415bcf89

1 files changed, 5 insertions, 1 deletions

diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 5bfa158ae..9cc673c0c 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -256,8 +256,10 @@ void QWaylandWindow::reset(bool sendDestroyEvent)
     if (isInitialized())
         destroy();
 
-    if (mFrameCallback)
+    if (mFrameCallback) {
         wl_callback_destroy(mFrameCallback);
+        mFrameCallback = nullptr;
+    }
 }
 
 QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface)
@@ -725,6 +727,8 @@ QWaylandWindow *QWaylandWindow::transientParent() const
     // events.
     if (auto transientParent = window()->transientParent())
         return static_cast<QWaylandWindow *>(topLevelWindow(transientParent)->handle());
+    else if (QGuiApplication::focusWindow() && (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup))
+        return static_cast<QWaylandWindow *>(topLevelWindow(QGuiApplication::focusWindow())->handle());
 
     return nullptr;
 }