diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 01:05:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 01:05:17 +0100 |
| commit | df015bd2e40e7654b2515996d5bd82469542581a (patch) | |
| tree | a36b7e9b2c9a7ccc1158d004c7b4a325200bb261 /src/compositor/extensions/qwaylandxdgshellv5.h | |
| parent | f72d63866d3f5820865fcd309b649dc9932518ee (diff) | |
| parent | 0e2a950895805457a45abe860bc91a7cc4ba405e (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
Change-Id: Ie45a13d3c866d0503e6e31b2a53b70f3420c5066
Diffstat (limited to 'src/compositor/extensions/qwaylandxdgshellv5.h')
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshellv5.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshellv5.h b/src/compositor/extensions/qwaylandxdgshellv5.h index 269ea8934..4adf0f9b8 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5.h +++ b/src/compositor/extensions/qwaylandxdgshellv5.h @@ -212,7 +212,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPopupV5 : public QWaylandShellSurfa Q_PROPERTY(QWaylandXdgShellV5 *shell READ shell NOTIFY shellChanged) Q_PROPERTY(QWaylandSurface *surface READ surface NOTIFY surfaceChanged) Q_PROPERTY(QWaylandSurface *parentSurface READ parentSurface NOTIFY parentSurfaceChanged) - Q_PROPERTY(QPoint position READ position) + Q_PROPERTY(QPoint position READ position NOTIFY positionChanged) public: QWaylandXdgPopupV5(); @@ -245,6 +245,7 @@ Q_SIGNALS: void shellChanged(); void surfaceChanged(); void parentSurfaceChanged(); + void positionChanged(); private: void initialize() override; |