Merge remote-tracking branch 'origin/5.10' into dev

Conflicts:
	.qmake.conf
	sc/corelib/io/qfsfileengine_p.h
	src/corelib/io/qstorageinfo_unix.cpp
	src/platformsupport/eglconvenience/qeglpbuffer_p.h
	src/platformsupport/input/libinput/qlibinputkeyboard.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/plugins/platforms/ios/qiosscreen.h
	src/plugins/platforms/ios/qioswindow.h
	src/plugins/platforms/ios/quiview.mm
	src/printsupport/dialogs/qpagesetupdialog_unix_p.h
	src/printsupport/dialogs/qprintpreviewdialog.cpp
	src/printsupport/widgets/qcupsjobwidget_p.h
	src/widgets/widgets/qmenu.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c

1 files changed, 1 insertions, 2 deletions

diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 64c4fc5666..4796ed43d3 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -902,8 +902,7 @@ void QMenuPrivate::adjustMenuScreen(const QPoint &p)
     // The windowHandle must point to the screen where the menu will be shown.
     // The (item) size calculations depend on the menu screen,
     // so a wrong screen would often cause wrong sizes (on high DPI)
-    const QScreen *primaryScreen = QApplication::primaryScreen();
-    const QScreen *currentScreen = q->windowHandle() ? q->windowHandle()->screen() : primaryScreen;
+    const QScreen *currentScreen = q->windowHandle() ? q->windowHandle()->screen() : nullptr;
     QScreen *actualScreen = QGuiApplication::screenAt(p);
     if (actualScreen && currentScreen != actualScreen) {
         if (!q->windowHandle()) // Try to create a window handle if not created.