aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-02 09:51:15 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-02 09:51:16 +0100
commitefc5564c19f3b15eb9a7b0022d201c866a9cf216 (patch)
tree26fdf65efabf7fc29f566cba71792506e8693dbe
parent5d27e14e4ca49263d9c3309b5e93d4cb386063cc (diff)
parent223c1524a7693e2c0f2312dd738c6aeb484358a5 (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10
-rw-r--r--src/imports/platform/qquickplatformmenu.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp
index 82adb6c3..ec5c4804 100644
--- a/src/imports/platform/qquickplatformmenu.cpp
+++ b/src/imports/platform/qquickplatformmenu.cpp
@@ -44,6 +44,7 @@
#include <QtGui/qcursor.h>
#include <QtGui/qpa/qplatformtheme.h>
#include <QtGui/private/qguiapplication_p.h>
+#include <QtGui/private/qhighdpiscaling_p.h>
#include <QtQml/private/qqmlengine_p.h>
#include <QtQml/private/qv4scopedvalue_p.h>
#include <QtQml/private/qv4qobjectwrapper_p.h>
@@ -705,8 +706,9 @@ void QQuickPlatformMenu::open(QQmlV4Function *args)
targetRect.moveTo(pos);
#endif
}
-
- m_handle->showPopup(window, targetRect, menuItem ? menuItem->handle() : nullptr);
+ m_handle->showPopup(window,
+ QHighDpi::toNativePixels(targetRect, window),
+ menuItem ? menuItem->handle() : nullptr);
}
/*!