diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 10:30:40 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 10:35:50 +0100 |
| commit | 3698b116a1973146b76319673cdb6787f13f2de6 (patch) | |
| tree | de31e4c3365d6852ed1f41621960ac9e48e85106 /src/client/qwaylanddisplay_p.h | |
| parent | 68993c012b88df43b2cd75a8c8704092760f28c0 (diff) | |
| parent | 4d3c3a08eba8d30805f18397c98e19ab9fd40722 (diff) | |
Merge remote-tracking branch 'qt/5.6' into wip-compositor-api
Change-Id: Ie70fdd03e1259a8cb75bbdbf1324e3e4a2b51807
Diffstat (limited to 'src/client/qwaylanddisplay_p.h')
| -rw-r--r-- | src/client/qwaylanddisplay_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index f6500b0b2..d5ee16fc9 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -176,6 +176,7 @@ public slots: private: void waitForScreens(); void exitWithError(); + void checkError() const; struct Listener { RegistryListener listener; @@ -185,8 +186,6 @@ private: struct wl_display *mDisplay; QtWayland::wl_compositor mCompositor; struct wl_shm *mShm; - QThread *mEventThread; - QWaylandEventThread *mEventThreadObject; QScopedPointer<QtWayland::wl_shell> mShell; QScopedPointer<QWaylandXdgShell> mShellXdg; QList<QWaylandScreen *> mScreens; |