From ed6ec7449a16407e4c3aef7a7a64924b9a748513 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Fri, 2 Feb 2018 09:28:17 +0100
Subject: QQuickMenu1::__popup(): Scale target rectangle

Same as 223c15 for QQC2. The QPlatform* classes operate in native pixels.

Task-number: QTBUG-55251
Change-Id: I4a3fa64313a6035dab96906fa57a27240e080678
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/controls/qquickmenu.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp
index d309b67e..3c6d91ef 100644
--- a/src/controls/qquickmenu.cpp
+++ b/src/controls/qquickmenu.cpp
@@ -45,6 +45,7 @@
 #include <qdebug.h>
 #include <qabstractitemmodel.h>
 #include <qcursor.h>
+#include <private/qhighdpiscaling_p.h>
 #include <private/qguiapplication_p.h>
 #include <QtGui/qpa/qplatformtheme.h>
 #include <QtGui/qpa/qplatformmenu.h>
@@ -456,7 +457,9 @@ void QQuickMenu1::__popup(const QRectF &targetRect, int atItemIndex, MenuType me
         }
         globalTargetRect.translate(renderOffset);
         m_platformMenu->setMenuType(QPlatformMenu::MenuType(menuType));
-        m_platformMenu->showPopup(parentWindow, globalTargetRect.toRect(), atItem ? atItem->platformItem() : 0);
+        m_platformMenu->showPopup(parentWindow,
+                                  QHighDpi::toNativePixels(globalTargetRect.toRect(), parentWindow),
+                                  atItem ? atItem->platformItem() : 0);
     } else {
         m_popupWindow = new QQuickMenuPopupWindow1(this);
         if (visualItem())
-- 
cgit v1.2.1


From 93c5dc8b5abdbdfca505dd4d3d9892856d1f51d7 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 2 Feb 2018 15:12:06 +0100
Subject: Bump version

Change-Id: I632fd6276b76e46515921489cbdfcdab9e3dd1c8
---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index 5e72674d..ca73f734 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
 CONFIG += warning_clean
 android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop
 
-MODULE_VERSION = 5.9.4
+MODULE_VERSION = 5.9.5
-- 
cgit v1.2.1