Merge remote-tracking branch 'origin/5.4.1' into 5.4

Change-Id: I50eee4d028e7ca1ae601c308e95a5a2e7f437a95

2 files changed, 27 insertions, 1 deletions

diff --git a/dist/changes-5.4.1 b/dist/changes-5.4.1
new file mode 100644
index 00000000..f2d8c359
--- /dev/null
+++ b/dist/changes-5.4.1
@@ -0,0 +1,26 @@
+Qt 5.4.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.4.0.
+
+  http://doc.qt.io/qt-5.4/
+
+The Qt version 5.4 series is binary compatible with the 5.3.x series.
+Applications compiled for 5.3 will continue to run with 5.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          General                                         *
+****************************************************************************
+
+ - [QTBUG-42506] Fixed StackView focus handling by making it a FocusScope.
+ - Documented how to select a specific Android theme.
+ - Fixed iOS edit menu to show up only when the control has active focus.
+ - [QTBUG-43693] Fixed popup positioning to take all screen geometry into
+   account.
+ - Fixed some documentation linking issues.
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())) {