Merge branch 'Plasma/5.8'

plugins/qpa/integration.cpp

@@ -226,7 +226,7 @@ void Integration::createWaylandOutput(quint32 name, quint32 version)
         m_dummyScreen = nullptr;
     }
     using namespace KWayland::Client;
-    auto o = m_registry->createOutput(name, version, this);
+    auto o = m_registry->createOutput(name, version, m_registry);
     connect(o, &Output::changed, this,
         [this, o] {
             disconnect(o, &Output::changed, nullptr, nullptr);

plugins/qpa/screen.cpp

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "screen.h"
 #include "platformcursor.h"
+#include "wayland_server.h"
 
 #include <KWayland/Client/output.h>
 
@@ -29,7 +30,7 @@ namespace QPA
 
 Screen::Screen(KWayland::Client::Output *o)
     : QPlatformScreen()
-    , m_output(o)
+    , m_output(QPointer<KWayland::Client::Output>(o))
     , m_cursor(new PlatformCursor)
 {
     // TODO: connect to resolution changes

plugins/qpa/screen.h

@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_QPA_SCREEN_H
 
 #include <qpa/qplatformscreen.h>
+#include <QPointer>
 
 namespace KWayland
 {
@@ -50,7 +51,7 @@ public:
     QDpi logicalDpi() const override;
 
 private:
-    KWayland::Client::Output *m_output;
+    QPointer<KWayland::Client::Output> m_output;
     QScopedPointer<PlatformCursor> m_cursor;
 };