diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:17 +0200 |
| commit | 6b29f99bb1f88b0a8e8c04552a25fcf81928a7e2 (patch) | |
| tree | a35bc609a1ff391f38c1ca450bfe4d95ac284f81 /src/client/qwaylandwindow_p.h | |
| parent | 465e6f559fccf04203997cdf5182693567a9e697 (diff) | |
| parent | 7b9ff873fc6b55a26e43753c738ebd941c796e29 (diff) | |
| download | qtwayland-6b29f99bb1f88b0a8e8c04552a25fcf81928a7e2.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I31f4c29c985301d28d5c8d0501761c7d4fb7fda6
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index 678fc3ae..57f4657b 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -126,7 +126,6 @@ public: using QtWayland::wl_surface::attach; void attach(QWaylandBuffer *buffer, int x, int y); void attachOffset(QWaylandBuffer *buffer); - QWaylandBuffer *attached() const; QPoint attachOffset() const; using QtWayland::wl_surface::damage; @@ -243,6 +242,8 @@ private: bool setWindowStateInternal(Qt::WindowState flags); void setGeometry_helper(const QRect &rect); void initWindow(); + bool shouldCreateShellSurface() const; + bool shouldCreateSubSurface() const; void reset(); void handleMouseEventWithDecoration(QWaylandInputDevice *inputDevice, const QWaylandPointerEvent &e); |