diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-19 13:15:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-02-10 12:00:30 +0000 |
| commit | fc9c57cf8b66bafbcaa6957bb22293047aa3d9df (patch) | |
| tree | 04f2dbd802ecc798c76e6ad018941e0e8f2dd728 | |
| parent | 144bc5cedd9af5e62fe7210bac7df2c19d20c41b (diff) | |
| download | qtquickcontrols-fc9c57cf8b66bafbcaa6957bb22293047aa3d9df.tar.gz | |
Revert "Adjust popup position by offset of the view in the toplevel window"v5.6.0-rc1
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 <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
| -rw-r--r-- | src/controls/qquickpopupwindow.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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(); } |