Revert "Add position property to QWaylandXdgPopup"

This commit would have broken source and binary compatibility between
5.7.0 and 5.7.1.

This reverts commit 20692ad15b8ac0c24b12d30609f061a740c87f23.

Change-Id: Ic4156571889ec08a708e67c55d461d3052ce0ad0
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>

1 files changed, 5 insertions, 28 deletions

diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index 76879fbf1..dfc68e254 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -199,7 +199,7 @@ void QWaylandXdgShellPrivate::xdg_shell_get_xdg_popup(Resource *resource, uint32
     if (!xdgPopup) {
         // A QWaylandXdgPopup was not created in response to the createXdgPopup signal, so we
         // create one as fallback here instead.
-        xdgPopup = new QWaylandXdgPopup(q, surface, parentSurface, position, xdgPopupResource);
+        xdgPopup = new QWaylandXdgPopup(q, surface, parentSurface, xdgPopupResource);
     }
 
     registerXdgPopup(xdgPopup);
@@ -949,10 +949,10 @@ QWaylandXdgPopup::QWaylandXdgPopup()
  * given \a parentSurface and \a resource.
  */
 QWaylandXdgPopup::QWaylandXdgPopup(QWaylandXdgShell *xdgShell, QWaylandSurface *surface,
-                                   QWaylandSurface *parentSurface, const QPoint &position, const QWaylandResource &resource)
+                                   QWaylandSurface *parentSurface, const QWaylandResource &resource)
     : QWaylandCompositorExtensionTemplate<QWaylandXdgPopup>(*new QWaylandXdgPopupPrivate)
 {
-    initialize(xdgShell, surface, parentSurface, position, resource);
+    initialize(xdgShell, surface, parentSurface, resource);
 }
 
 /*!
@@ -966,14 +966,13 @@ QWaylandXdgPopup::QWaylandXdgPopup(QWaylandXdgShell *xdgShell, QWaylandSurface *
  * Initializes the QWaylandXdgPopup, associating it with the given \a shell \a surface,
  * \a parentSurface and \a resource.
  */
-void QWaylandXdgPopup::initialize(QWaylandXdgShell *shell, QWaylandSurface *surface, QWaylandSurface *parentSurface,
-                                  const QPoint& position, const QWaylandResource &resource)
+void QWaylandXdgPopup::initialize(QWaylandXdgShell *shell, QWaylandSurface *surface,
+                                  QWaylandSurface *parentSurface, const QWaylandResource &resource)
 {
     Q_D(QWaylandXdgPopup);
     d->m_surface = surface;
     d->m_parentSurface = parentSurface;
     d->m_xdgShell = shell;
-    d->m_position = position;
     d->init(resource.resource());
     setExtensionContainer(surface);
     emit surfaceChanged();
@@ -1016,28 +1015,6 @@ QWaylandSurface *QWaylandXdgPopup::parentSurface() const
     return d->m_parentSurface;
 }
 
-
-/*!
- * \qmlproperty object QtWaylandCompositor::XdgPopup::position
- *
- * This property holds the location of the upper left corner of the surface
- * relative to the upper left corner of the parent surface, in surface local
- * coordinates.
- */
-
-/*!
- * \property QWaylandXdgPopup::position
- *
- * This property holds the location of the upper left corner of the surface
- * relative to the upper left corner of the parent surface, in surface local
- * coordinates.
- */
-QPoint QWaylandXdgPopup::position() const
-{
-    Q_D(const QWaylandXdgPopup);
-    return d->m_position;
-}
-
 /*!
  * \internal
  */