Rebase upstream patch to Qt 5.15.6
This commit is contained in:
parent
d2744e8950
commit
e0d21b65e9
@ -14,10 +14,10 @@ Change-Id: I57df9aedea7cc6f0b6fa142a6fc6c3bdc98324c8
|
|||||||
Reviewed-by: David Edmundson <davidedmundson@kde.org>
|
Reviewed-by: David Edmundson <davidedmundson@kde.org>
|
||||||
(cherry picked from commit 59a5fe99e1569421b920d99c5b20cdafcdcf43a9)
|
(cherry picked from commit 59a5fe99e1569421b920d99c5b20cdafcdcf43a9)
|
||||||
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
|
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
|
||||||
index 1c76294..3b99c4b 100644
|
index 4940f1c..7389021 100644
|
||||||
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
|
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
|
||||||
+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
|
+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
|
||||||
@@ -410,6 +410,13 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
|
@@ -437,6 +437,13 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
|
||||||
positioner->set_anchor(QtWayland::xdg_positioner::anchor_top_left);
|
positioner->set_anchor(QtWayland::xdg_positioner::anchor_top_left);
|
||||||
positioner->set_gravity(QtWayland::xdg_positioner::gravity_bottom_right);
|
positioner->set_gravity(QtWayland::xdg_positioner::gravity_bottom_right);
|
||||||
positioner->set_size(m_window->geometry().width(), m_window->geometry().height());
|
positioner->set_size(m_window->geometry().width(), m_window->geometry().height());
|
||||||
@ -28,6 +28,6 @@ index 1c76294..3b99c4b 100644
|
|||||||
+ | QtWayland::xdg_positioner::constraint_adjustment_flip_x
|
+ | QtWayland::xdg_positioner::constraint_adjustment_flip_x
|
||||||
+ | QtWayland::xdg_positioner::constraint_adjustment_flip_y);
|
+ | QtWayland::xdg_positioner::constraint_adjustment_flip_y);
|
||||||
+ }
|
+ }
|
||||||
m_popup = new Popup(this, parentXdgSurface, positioner);
|
m_popup = new Popup(this, parent, positioner);
|
||||||
positioner->destroy();
|
positioner->destroy();
|
||||||
delete positioner;
|
|
||||||
|
Loading…
Reference in New Issue
Block a user