diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-08-28 07:37:19 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-08-29 14:11:20 +0200 |
| commit | c4318f7b831778acf385cad99f33f000f2a9e045 (patch) | |
| tree | f9411c6e86bbd9d446383bb9c5068612f441e801 /src/client/qwaylanddisplay_p.h | |
| parent | fc9c4a04d7359cb00a733c56cf85fc9737c9886d (diff) | |
| parent | f5a28afe4c2cb82540c94616e7a9e3e72e0e8327 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/client/qwaylandinputdevice.cpp
src/client/qwaylandintegration.cpp
src/client/qwaylandwindow_p.h
src/shared/qwaylandxkb.cpp
Change-Id: Ibac7998502351e93c71c9b786536298657afe3d0
Diffstat (limited to 'src/client/qwaylanddisplay_p.h')
| -rw-r--r-- | src/client/qwaylanddisplay_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index 558d8d9b5..7cfbc19b8 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -201,7 +201,6 @@ public slots: private: void waitForScreens(); - void exitWithError(); void checkError() const; void handleWaylandSync(); |