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

Conflicts:
	src/plugins/platforms/xcb/qxcbnativeinterface.cpp
	src/plugins/platforms/xcb/qxcbnativeinterface.h

Change-Id: I31b38ba439b9341d51a01c0fd54bea33f7410076

4 files changed, 21 insertions, 12 deletions

diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp
index f63685c37a..3b33894627 100644
--- a/src/widgets/kernel/qopenglwidget.cpp
+++ b/src/widgets/kernel/qopenglwidget.cpp
@@ -768,6 +768,7 @@ void QOpenGLWidgetPrivate::resolveSamples()
         q->makeCurrent();
         QRect rect(QPoint(0, 0), fbo->size());
         QOpenGLFramebufferObject::blitFramebuffer(resolvedFbo, rect, fbo, rect);
+        QOpenGLContext::currentContext()->functions()->glFlush();
     }
 }
 
diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index c4326aaa5a..c08c4eeb32 100644
--- a/src/widgets/kernel/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
@@ -44,6 +44,7 @@
 #include <private/qshortcutmap_p.h>
 #include <private/qaction_p.h>
 #include <private/qwidgetwindow_p.h>
+#include <qpa/qplatformmenu.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -269,9 +270,13 @@ static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidge
             // On Mac, menu item shortcuts are processed before reaching any window.
             // That means that if a menu action shortcut has not been already processed
             // (and reaches this point), then the menu item itself has been disabled.
-            // This occurs at the QPA level on Mac, were we disable all the Cocoa menus
-            // when showing a modal window.
-            if (a->shortcut().count() < 1 || (a->shortcut().count() == 1 && (a->shortcut()[0] & Qt::MODIFIER_MASK) != 0))
+            // This occurs at the QPA level on Mac, where we disable all the Cocoa menus
+            // when showing a modal window. (Notice that only the QPA menu is disabled,
+            // not the QMenu.) Since we can also reach this code by climbing the menu
+            // hierarchy (see below), or when the shortcut is not a key-equivalent, we
+            // need to check whether the QPA menu is actually disabled.
+            QPlatformMenu *pm = menu->platformMenu();
+            if (!pm || !pm->isEnabled())
                 continue;
 #endif
             QAction *a = menu->menuAction();
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 6d8bad3149..07a39234ef 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -7144,14 +7144,16 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
 
     bool needsShow = false;
 
-    if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
-        q->setAttribute(Qt::WA_OutsideWSRange, true);
-        if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
-            hide_sys();
-        data.crect = QRect(x, y, w, h);
-    } else if (q->isVisible() && q->testAttribute(Qt::WA_OutsideWSRange)) {
-        q->setAttribute(Qt::WA_OutsideWSRange, false);
-        needsShow = true;
+    if (q->isWindow()) {
+        if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
+            q->setAttribute(Qt::WA_OutsideWSRange, true);
+            if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
+                hide_sys();
+            data.crect = QRect(x, y, w, h);
+        } else if (q->isVisible() && q->testAttribute(Qt::WA_OutsideWSRange)) {
+            q->setAttribute(Qt::WA_OutsideWSRange, false);
+            needsShow = true;
+        }
     }
 
     if (q->isVisible()) {
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index b7ffc20c8e..12f5d4b8b0 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -554,7 +554,8 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
                                             &qt_button_down, qt_last_mouse_receiver);
     }
 #ifndef QT_NO_CONTEXTMENU
-    if (event->type() == contextMenuTrigger && event->button() == Qt::RightButton) {
+    if (event->type() == contextMenuTrigger && event->button() == Qt::RightButton
+        && m_widget->rect().contains(event->pos())) {
         QContextMenuEvent e(QContextMenuEvent::Mouse, mapped, event->globalPos(), event->modifiers());
         QGuiApplication::sendSpontaneousEvent(receiver, &e);
     }