summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2015-11-15 12:14:26 +0100
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-11-27 09:53:54 +0000
commit40217a5a3fb20a625ae4ec43cda84f89a435482d (patch)
treebc3d1798cea6ac510b5766b1a8ccad9fb9d2da47
parentf484c14f8094ef29f904a947538f9556a4bcab3b (diff)
Rename setPopup surface argument
Make setPopup signature consistent with setTransient and fix potential issues with QML since "parent" is special. Change-Id: Ib3736af63d106f50379b3e296b73d8690d9bc09f Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
-rw-r--r--src/compositor/extensions/qwaylandshell.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandshell.h b/src/compositor/extensions/qwaylandshell.h
index 89016a24..3794a11d 100644
--- a/src/compositor/extensions/qwaylandshell.h
+++ b/src/compositor/extensions/qwaylandshell.h
@@ -134,7 +134,7 @@ Q_SIGNALS:
void setDefaultToplevel();
void setTransient(QWaylandSurface *parentSurface, const QPoint &relativeToParent, FocusPolicy focusPolicy);
void setFullScreen(FullScreenMethod method, uint framerate, QWaylandOutput *output);
- void setPopup(QWaylandInputDevice *inputDevice, QWaylandSurface *parent, const QPoint &relativeToParent);
+ void setPopup(QWaylandInputDevice *inputDevice, QWaylandSurface *parentSurface, const QPoint &relativeToParent);
void setMaximized(QWaylandOutput *output);
private: