diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-12 15:53:02 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-12 15:53:02 +0100 |
| commit | 1a5413df3d9a0602f074562e2e92751df369d016 (patch) | |
| tree | 461a56ee176e873bee441fe4d899d7a683deca9d /src/controls/qquickmenupopupwindow.cpp | |
| parent | a2f81b85d5dfa7fbd3b11557fe38de649a1f6914 (diff) | |
| parent | 9af9dabe3c88baa87befe5a4591d7f3508888307 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/controls/TableView.qml
tests/auto/controls/data/tst_gridlayout.qml
Change-Id: I030bc50dc8fcf7b6b00e183dc3a67c3cd012f3fb
Diffstat (limited to 'src/controls/qquickmenupopupwindow.cpp')
| -rw-r--r-- | src/controls/qquickmenupopupwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/qquickmenupopupwindow.cpp b/src/controls/qquickmenupopupwindow.cpp index 1c5f8d0b9..520639799 100644 --- a/src/controls/qquickmenupopupwindow.cpp +++ b/src/controls/qquickmenupopupwindow.cpp @@ -96,7 +96,7 @@ void QQuickMenuPopupWindow::setGeometry(int posx, int posy, int w, int h) pw = parentItem()->window(); if (!pw) pw = this; - QRect g = pw->screen()->availableVirtualGeometry(); + QRect g = pw->screen()->virtualGeometry(); if (posx + w > g.right()) { if (qobject_cast<QQuickMenuPopupWindow *>(transientParent())) { |