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

 Conflicts:
	.qmake.conf
	mkspecs/win32-g++/qmake.conf
	src/corelib/global/qglobal_p.h
	src/corelib/global/qoperatingsystemversion_p.h
	src/corelib/io/qfilesystemengine_win.cpp
	src/network/bearer/qbearerengine.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/sql/doc/snippets/code/doc_src_sql-driver.cpp
	src/widgets/kernel/qwidget_p.h
	src/widgets/kernel/qwidgetwindow.cpp
	src/widgets/styles/qfusionstyle.cpp
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp

Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8

1 files changed, 44 insertions, 0 deletions

diff --git a/src/gui/kernel/qinputdevicemanager.cpp b/src/gui/kernel/qinputdevicemanager.cpp
index 2d231ae26f..37b1450d5a 100644
--- a/src/gui/kernel/qinputdevicemanager.cpp
+++ b/src/gui/kernel/qinputdevicemanager.cpp
@@ -92,4 +92,48 @@ void QInputDeviceManager::setCursorPos(const QPoint &pos)
     emit cursorPositionChangeRequested(pos);
 }
 
+/*!
+    \return the keyboard modifier state stored in the QInputDeviceManager object.
+
+    Keyboard input handlers are expected to keep this up-to-date via
+    setKeyboardModifiers().
+
+    Querying the state via this function (e.g. from a mouse handler that needs
+    to include the modifier state in mouse events) is the preferred alternative
+    over QGuiApplication::keyboardModifiers() since the latter may not report
+    the current state due to asynchronous QPA event processing.
+ */
+Qt::KeyboardModifiers QInputDeviceManager::keyboardModifiers() const
+{
+    Q_D(const QInputDeviceManager);
+    return d->keyboardModifiers;
+}
+
+void QInputDeviceManager::setKeyboardModifiers(Qt::KeyboardModifiers modsBeforeEvent, int key)
+{
+    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;
+}
+
 QT_END_NAMESPACE