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

Conflicts:
	src/gui/kernel/qguiapplication.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/testlib/qtestsystem.h

Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5

4 files changed, 9 insertions, 9 deletions

diff --git a/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp b/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
index cfc17a79c3..dbab2f6a24 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
+++ b/src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp
@@ -149,9 +149,11 @@ void QEvdevTabletData::report()
     qreal pressure = pressureRange ? (state.p - minValues.p) / qreal(pressureRange) : qreal(1);
 
     if (state.down || state.lastReportDown) {
-        QWindowSystemInterface::handleTabletEvent(0, state.down, QPointF(), globalPos,
+        QWindowSystemInterface::handleTabletEvent(0, QPointF(), globalPos,
                                                   QTabletEvent::Stylus, pointer,
-                                                  pressure, 0, 0, 0, 0, 0, q->deviceId(), qGuiApp->keyboardModifiers());
+                                                  state.down ? Qt::LeftButton : Qt::NoButton,
+                                                  pressure, 0, 0, 0, 0, 0, q->deviceId(),
+                                                  qGuiApp->keyboardModifiers());
     }
 
     if (state.lastReportTool && !state.tool)
diff --git a/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h b/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
index cd760ba40a..66e821117a 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
+++ b/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
@@ -63,15 +63,12 @@ class QEvdevTabletData;
 
 class QEvdevTabletHandler : public QObject
 {
-    Q_OBJECT
-
 public:
     explicit QEvdevTabletHandler(const QString &device, const QString &spec = QString(), QObject *parent = 0);
     ~QEvdevTabletHandler();
 
     qint64 deviceId() const;
 
-private slots:
     void readData();
 
 private:
diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
index 4b00424e92..90949408ac 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
+++ b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
@@ -88,8 +88,11 @@ QEvdevTabletManager::QEvdevTabletManager(const QString &key, const QString &spec
             const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
             for (const QString &device : devices)
                 addDevice(device);
-            connect(m_deviceDiscovery, SIGNAL(deviceDetected(QString)), this, SLOT(addDevice(QString)));
-            connect(m_deviceDiscovery, SIGNAL(deviceRemoved(QString)), this, SLOT(removeDevice(QString)));
+
+            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
+                    this, &QEvdevTabletManager::addDevice);
+            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
+                    this, &QEvdevTabletManager::removeDevice);
         }
     }
 }
diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h b/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h
index d166c06cf3..cde91c55aa 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h
+++ b/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h
@@ -62,12 +62,10 @@ class QEvdevTabletHandlerThread;
 
 class QEvdevTabletManager : public QObject
 {
-    Q_OBJECT
 public:
     QEvdevTabletManager(const QString &key, const QString &spec, QObject *parent = 0);
     ~QEvdevTabletManager();
 
-private slots:
     void addDevice(const QString &deviceNode);
     void removeDevice(const QString &deviceNode);