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

Conflicts:
	src/corelib/io/qfilesystemengine_win.cpp
	src/gui/text/qdistancefield.cpp
	src/plugins/platforms/xcb/qxcbconnection.h

Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e

2 files changed, 26 insertions, 1 deletions

diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.cpp b/tests/manual/qtabletevent/device_information/tabletwidget.cpp
index b4273bde8e..14d059abc1 100644
--- a/tests/manual/qtabletevent/device_information/tabletwidget.cpp
+++ b/tests/manual/qtabletevent/device_information/tabletwidget.cpp
@@ -33,7 +33,7 @@
 #include <QMetaObject>
 #include <QMetaEnum>
 
-TabletWidget::TabletWidget(bool mouseToo) : mMouseToo(mouseToo), mWheelEventCount(0)
+TabletWidget::TabletWidget(bool mouseToo) : mMouseToo(mouseToo), mWheelEventCount(0), mQuitShortcut(QKeySequence::Quit, this)
 {
     QPalette newPalette = palette();
     newPalette.setColor(QPalette::Window, Qt::white);
@@ -41,6 +41,7 @@ TabletWidget::TabletWidget(bool mouseToo) : mMouseToo(mouseToo), mWheelEventCoun
     setPalette(newPalette);
     qApp->installEventFilter(this);
     resetAttributes();
+    connect(&mQuitShortcut, SIGNAL(activated()), qApp, SLOT(quit()));
 }
 
 bool TabletWidget::eventFilter(QObject *, QEvent *ev)
@@ -68,6 +69,7 @@ bool TabletWidget::eventFilter(QObject *, QEvent *ev)
             mRot = event->rotation();
             mButton = event->button();
             mButtons = event->buttons();
+            mModifiers = event->modifiers();
             mTimestamp = event->timestamp();
             if (isVisible())
                 update();
@@ -172,6 +174,7 @@ void TabletWidget::paintEvent(QPaintEvent *)
 
         eventInfo << QString("Button: %1 (0x%2)").arg(buttonToString(mButton)).arg(mButton, 0, 16);
         eventInfo << QString("Buttons currently pressed: %1 (0x%2)").arg(buttonsToString(mButtons)).arg(mButtons, 0, 16);
+        eventInfo << QString("Keyboard modifiers: %1 (0x%2)").arg(modifiersToString(mModifiers)).arg(mModifiers, 0, 16);
         eventInfo << QString("Pressure: %1").arg(QString::number(mPress));
         eventInfo << QString("Tangential pressure: %1").arg(QString::number(mTangential));
         eventInfo << QString("Rotation: %1").arg(QString::number(mRot));
@@ -205,6 +208,24 @@ QString TabletWidget::buttonsToString(Qt::MouseButtons bs)
     return ret.join(QLatin1Char('|'));
 }
 
+QString TabletWidget::modifiersToString(Qt::KeyboardModifiers m)
+{
+    QStringList ret;
+    if (m & Qt::ShiftModifier)
+        ret << QLatin1String("Shift");
+    if (m & Qt::ControlModifier)
+        ret << QLatin1String("Control");
+    if (m & Qt::AltModifier)
+        ret << QLatin1String("Alt");
+    if (m & Qt::MetaModifier)
+        ret << QLatin1String("Meta");
+    if (m & Qt::KeypadModifier)
+        ret << QLatin1String("Keypad");
+    if (m & Qt::GroupSwitchModifier)
+        ret << QLatin1String("GroupSwitch");
+    return ret.join(QLatin1Char('|'));
+}
+
 void TabletWidget::tabletEvent(QTabletEvent *event)
 {
     event->accept();
diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.h b/tests/manual/qtabletevent/device_information/tabletwidget.h
index 2b014a213a..404be1289f 100644
--- a/tests/manual/qtabletevent/device_information/tabletwidget.h
+++ b/tests/manual/qtabletevent/device_information/tabletwidget.h
@@ -31,6 +31,7 @@
 
 #include <QWidget>
 #include <QTabletEvent>
+#include <QShortcut>
 
 // a widget showing the information of the last tablet event
 class TabletWidget : public QWidget
@@ -43,6 +44,7 @@ protected:
     void paintEvent(QPaintEvent *event);
     const char *buttonToString(Qt::MouseButton b);
     QString buttonsToString(Qt::MouseButtons bs);
+    QString modifiersToString(Qt::KeyboardModifiers m);
 private:
     void resetAttributes() {
         mType = mDev = mPointerType = mXT = mYT = mZ = 0;
@@ -57,11 +59,13 @@ private:
     int mDev, mPointerType, mXT, mYT, mZ;
     Qt::MouseButton mButton;
     Qt::MouseButtons mButtons;
+    Qt::KeyboardModifiers mModifiers;
     qreal mPress, mTangential, mRot;
     qint64 mUnique;
     bool mMouseToo;
     ulong mTimestamp;
     int mWheelEventCount;
+    QShortcut mQuitShortcut;
 };
 
 #endif // TABLETWIDGET_H