Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/gui/image/qpixmap.cpp
	src/widgets/kernel/qformlayout.cpp

Change-Id: I8a8391a202adf7f18464a22ddf0a6c4974eab692

1 files changed, 7 insertions, 9 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
index 2faf82f5ff..e7952ae1f6 100644
--- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm
+++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
@@ -394,11 +394,6 @@ bool QCocoaKeyMapper::updateKeyboard()
         keyboardInputLocale = QLocale::c();
         keyboardInputDirection = Qt::LeftToRight;
     }
-
-    const auto newMode = keyboard_mode;
-    deleteLayouts();
-    keyboard_mode = newMode;
-
     return true;
 }
 
@@ -421,8 +416,10 @@ void QCocoaKeyMapper::clearMappings()
 
 void QCocoaKeyMapper::updateKeyMap(unsigned short macVirtualKey, QChar unicodeKey)
 {
-    updateKeyboard();
-
+    if (updateKeyboard()) {
+        // ### Qt 4 did this:
+        // QKeyMapper::changeKeyboard();
+    }
     if (keyLayout[macVirtualKey])
         return;
 
@@ -478,8 +475,9 @@ QList<int> QCocoaKeyMapper::possibleKeys(const QKeyEvent *event) const
     for (int i = 1; i < 8; ++i) {
         Qt::KeyboardModifiers neededMods = ModsTbl[i];
         int key = kbItem->qtKey[i];
-        if (key && key != baseKey && ((keyMods & neededMods) == neededMods))
-            ret << int(key + neededMods);
+        if (key && key != baseKey && ((keyMods & neededMods) == neededMods)) {
+            ret << int(key + (keyMods & ~neededMods));
+        }
     }
     return ret;
 }