diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 21:28:15 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-10 21:28:15 +0000 |
commit | 56fdef350cdf85e762950b204764f1a127280e1d (patch) | |
tree | 53d4b91f92d2bb026703b1d0c6727bb4c759bda2 | |
parent | 8c8303faad310d5bbe4abd2435a60c76d20cb1d6 (diff) | |
parent | 64847aad2ce1d3ad33f4b752a2abb4b535e23e0b (diff) | |
download | qtquickcontrols-56fdef350cdf85e762950b204764f1a127280e1d.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4
-rw-r--r-- | dist/changes-5.4.1 | 26 | ||||
-rw-r--r-- | src/controls/qquickmenupopupwindow.cpp | 2 |
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())) { |