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

Conflicts:
	src/client/qwaylanddisplay_p.h

Change-Id: I602b90a055d1322af369fb7b77a68583154b660f

1 files changed, 1 insertions, 2 deletions

diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h
index 664407b88..f5167dd29 100644
--- a/src/client/qwaylanddisplay_p.h
+++ b/src/client/qwaylanddisplay_p.h
@@ -178,6 +178,7 @@ public slots:
 private:
     void waitForScreens();
     void exitWithError();
+    void checkError() const;
 
     struct Listener {
         RegistryListener listener;
@@ -187,8 +188,6 @@ private:
     struct wl_display *mDisplay;
     QtWayland::wl_compositor mCompositor;
     QScopedPointer<QWaylandShm> mShm;
-    QThread *mEventThread;
-    QWaylandEventThread *mEventThreadObject;
     QScopedPointer<QtWayland::wl_shell> mShell;
     QScopedPointer<QWaylandXdgShell> mShellXdg;
     QList<QWaylandScreen *> mScreens;