diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:35:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:35:40 +0100 |
| commit | 64847aad2ce1d3ad33f4b752a2abb4b535e23e0b (patch) | |
| tree | 2c9af477ea0e3356d1ed0ce3dbc4679a9cd8a8b2 /src/controls | |
| parent | 0eab387b04713c0a52eeb688fe9fb92f33dd8015 (diff) | |
| parent | daa01c6130b27aad5b59f99727761688f9b509fe (diff) | |
| download | qtquickcontrols-64847aad2ce1d3ad33f4b752a2abb4b535e23e0b.tar.gz | |
Merge remote-tracking branch 'origin/5.4.1' into 5.4
Change-Id: I50eee4d028e7ca1ae601c308e95a5a2e7f437a95
Diffstat (limited to 'src/controls')
| -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 787896d8..b7f70db7 100644 --- a/src/controls/qquickmenupopupwindow.cpp +++ b/src/controls/qquickmenupopupwindow.cpp @@ -93,7 +93,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())) { |