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

Change-Id: Id13badc270db98806048753fd7fb658aa17f1ede

4 files changed, 13 insertions, 10 deletions

diff --git a/src/platformsupport/input/evdevtouch/evdevtouch.pri b/src/platformsupport/input/evdevtouch/evdevtouch.pri
index 16e1a981fa..402c276d4d 100644
--- a/src/platformsupport/input/evdevtouch/evdevtouch.pri
+++ b/src/platformsupport/input/evdevtouch/evdevtouch.pri
@@ -8,6 +8,8 @@ contains(QT_CONFIG, libudev) {
     LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
 }
 
-# DEFINES += USE_MTDEV
+contains(CONFIG, mtdev) {
+    CONFIG += link_pkgconfig
+    PKGCONFIG_PRIVATE += mtdev
+}
 
-contains(DEFINES, USE_MTDEV): LIBS_PRIVATE += -lmtdev
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouch.cpp b/src/platformsupport/input/evdevtouch/qevdevtouch.cpp
index 89215557c1..d9468ae1b8 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouch.cpp
+++ b/src/platformsupport/input/evdevtouch/qevdevtouch.cpp
@@ -49,7 +49,7 @@
 #include <QtPlatformSupport/private/qdevicediscovery_p.h>
 #include <linux/input.h>
 
-#ifdef USE_MTDEV
+#if !defined(QT_NO_MTDEV)
 extern "C" {
 #include <mtdev.h>
 }
@@ -164,7 +164,7 @@ static inline bool testBit(long bit, const long *array)
 
 QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &specification, QObject *parent)
     : QObject(parent), m_notify(0), m_fd(-1), d(0)
-#ifdef USE_MTDEV
+#if !defined(QT_NO_MTDEV)
       , m_mtdev(0)
 #endif
 {
@@ -233,7 +233,7 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &specification,
         return;
     }
 
-#ifdef USE_MTDEV
+#if !defined(QT_NO_MTDEV)
     m_mtdev = static_cast<mtdev *>(calloc(1, sizeof(mtdev)));
     int mtdeverr = mtdev_open(m_mtdev, m_fd);
     if (mtdeverr) {
@@ -245,7 +245,7 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &specification,
 
     d = new QEvdevTouchScreenData(this, args);
 
-#ifdef USE_MTDEV
+#if !defined(QT_NO_MTDEV)
     const char *mtdevStr = "(mtdev)";
     d->m_typeB = true;
 #else
@@ -329,7 +329,7 @@ QEvdevTouchScreenHandler::QEvdevTouchScreenHandler(const QString &specification,
 
 QEvdevTouchScreenHandler::~QEvdevTouchScreenHandler()
 {
-#ifdef USE_MTDEV
+#if !defined(QT_NO_MTDEV)
     if (m_mtdev) {
         mtdev_close(m_mtdev);
         free(m_mtdev);
@@ -347,7 +347,7 @@ void QEvdevTouchScreenHandler::readData()
     ::input_event buffer[32];
     int n = 0;
     for (; ;) {
-#ifdef USE_MTDEV
+#if !defined(QT_NO_MTDEV)
         int result = mtdev_get(m_mtdev, m_fd, buffer, sizeof(buffer) / sizeof(::input_event));
         if (result > 0)
             result *= sizeof(::input_event);
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h
index be7dbfba14..dbd401c297 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h
+++ b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 class QSocketNotifier;
 class QEvdevTouchScreenData;
-#ifdef USE_MTDEV
+#if !defined(QT_NO_MTDEV)
 struct mtdev;
 #endif
 
@@ -71,7 +71,7 @@ private:
     QSocketNotifier *m_notify;
     int m_fd;
     QEvdevTouchScreenData *d;
-#ifdef USE_MTDEV
+#if !defined(QT_NO_MTDEV)
     mtdev *m_mtdev;
 #endif
 };
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index 231576ed01..8850f18bab 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -1729,6 +1729,7 @@ QSpiActionArray AtSpiAdaptor::getActions(QAccessibleActionInterface *actionInter
         QSpiAction action;
         QStringList keyBindings;
 
+        action.name = actionName;
         action.description = actionInterface->localizedActionDescription(actionName);
 
         keyBindings = actionInterface->keyBindingsForAction(actionName);