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

 Conflicts:
	examples/widgets/graphicsview/elasticnodes/graphwidget.cpp
	examples/widgets/graphicsview/elasticnodes/node.cpp
	examples/widgets/graphicsview/elasticnodes/node.h
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/cocoa/qnsview_drawing.mm
	src/widgets/kernel/qmacgesturerecognizer_p.h

Change-Id: I13cf06bac75d48d779d8ee7b5c91bfc976f2a32c

2 files changed, 2 insertions, 23 deletions

diff --git a/src/gui/kernel/qinputdevicemanager.cpp b/src/gui/kernel/qinputdevicemanager.cpp
index 37b1450d5a..6e4e5a9c93 100644
--- a/src/gui/kernel/qinputdevicemanager.cpp
+++ b/src/gui/kernel/qinputdevicemanager.cpp
@@ -109,30 +109,9 @@ Qt::KeyboardModifiers QInputDeviceManager::keyboardModifiers() const
     return d->keyboardModifiers;
 }
 
-void QInputDeviceManager::setKeyboardModifiers(Qt::KeyboardModifiers modsBeforeEvent, int key)
+void QInputDeviceManager::setKeyboardModifiers(Qt::KeyboardModifiers mods)
 {
     Q_D(QInputDeviceManager);
-    Qt::KeyboardModifiers mods;
-    switch (key) {
-    case Qt::Key_Shift:
-        mods = Qt::KeyboardModifiers(modsBeforeEvent ^ Qt::ShiftModifier);
-        break;
-    case Qt::Key_Control:
-        mods = Qt::KeyboardModifiers(modsBeforeEvent ^ Qt::ControlModifier);
-        break;
-    case Qt::Key_Alt:
-        mods = Qt::KeyboardModifiers(modsBeforeEvent ^ Qt::AltModifier);
-        break;
-    case Qt::Key_Meta:
-        mods = Qt::KeyboardModifiers(modsBeforeEvent ^ Qt::MetaModifier);
-        break;
-    case Qt::Key_AltGr:
-        mods = Qt::KeyboardModifiers(modsBeforeEvent ^ Qt::GroupSwitchModifier);
-        break;
-    default:
-        mods = modsBeforeEvent;
-        break;
-    }
     d->keyboardModifiers = mods;
 }
 
diff --git a/src/gui/kernel/qinputdevicemanager_p.h b/src/gui/kernel/qinputdevicemanager_p.h
index ddf1e6befa..d73c5526d0 100644
--- a/src/gui/kernel/qinputdevicemanager_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p.h
@@ -79,7 +79,7 @@ public:
     void setCursorPos(const QPoint &pos);
 
     Qt::KeyboardModifiers keyboardModifiers() const;
-    void setKeyboardModifiers(Qt::KeyboardModifiers modsBeforeEvent, int key);
+    void setKeyboardModifiers(Qt::KeyboardModifiers mods);
 
 signals:
     void deviceListChanged(QInputDeviceManager::DeviceType type);