Merge remote-tracking branch 'origin/api_changes'

Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1

3 files changed, 6 insertions, 4 deletions

diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index 91726f194b..180ab61ef9 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -51,6 +51,8 @@
 #include <QtGui/qcolor.h>
 #include <QtGui/qevent.h>
 
+#include <stdlib.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -216,7 +218,7 @@ public:
         // quint64 alertHigh : 1;
 
         State() {
-            qMemSet(this, 0, sizeof(State));
+            memset(this, 0, sizeof(State));
         }
     };
 
diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h
index 8497d35e2a..dcac22e5bb 100644
--- a/src/gui/accessible/qaccessible2.h
+++ b/src/gui/accessible/qaccessible2.h
@@ -109,7 +109,7 @@ public:
 class Q_GUI_EXPORT QAccessibleSimpleEditableTextInterface: public QAccessibleEditableTextInterface
 {
 public:
-    QAccessibleSimpleEditableTextInterface(QAccessibleInterface *accessibleInterface);  //###
+    explicit QAccessibleSimpleEditableTextInterface(QAccessibleInterface *accessibleInterface);  //###
 
     void copyText(int startOffset, int endOffset) const;
     void deleteText(int startOffset, int endOffset);
diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp
index d3344c3a3a..db4ee242ff 100644
--- a/src/gui/accessible/qaccessibleobject.cpp
+++ b/src/gui/accessible/qaccessibleobject.cpp
@@ -78,10 +78,10 @@ QList<QByteArray> QAccessibleObjectPrivate::actionList() const
             continue;
 
         if (!qstrcmp(member.tag(), "QACCESSIBLE_SLOT")) {
-            if (member.signature() == defaultAction)
+            if (member.methodSignature() == defaultAction)
                 actionList.prepend(defaultAction);
             else
-                actionList << member.signature();
+                actionList << member.methodSignature();
         }
     }