From fc9c57cf8b66bafbcaa6957bb22293047aa3d9df Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 19 Jan 2016 13:15:33 +0100 Subject: Revert "Adjust popup position by offset of the view in the toplevel window" This reverts commit c717082c098bbfc96848457436ca83db7b83e4c8, which was applied to fix popup position mapping for window containers. However, that change lead to a release blocker by breaking the very same use case with QQuickWidget, which is used by Qt Creator and is considered the modern alternative to those problematic window containers. Change-Id: I72c6d4985668a8dc1d4e1cf6e98f7597bc7c1d8f Task-number: QTBUG-49097 Reviewed-by: Friedemann Kleint Reviewed-by: Paul Olav Tvete Reviewed-by: Frederik Gladhorn Reviewed-by: Robert Loehning --- src/controls/qquickpopupwindow.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/controls/qquickpopupwindow.cpp b/src/controls/qquickpopupwindow.cpp index cfab5bd5..88d91137 100644 --- a/src/controls/qquickpopupwindow.cpp +++ b/src/controls/qquickpopupwindow.cpp @@ -67,7 +67,6 @@ void QQuickPopupWindow::show() if (QWindow *tp = transientParent()) { if (m_parentItem) { QPointF pos = m_parentItem->mapToItem(m_parentItem->window()->contentItem(), QPointF(posx, posy)); - pos += tp->mapFromGlobal(m_parentItem->window()->mapToGlobal(QPoint())); posx = pos.x(); posy = pos.y(); } -- cgit v1.2.1