Merge master into api_changes

Conflicts:
	src/corelib/kernel/qmetatype.cpp
	src/gui/kernel/qplatformsurface_qpa.cpp
	tests/auto/corelib/tools/qtimeline/qtimeline.pro

Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index e8a5cf8bad..ffdd3fe7ce 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -327,7 +327,7 @@ public:
     };
 
     typedef QAccessibleInterface*(*InterfaceFactory)(const QString &key, QObject*);
-    typedef void(*UpdateHandler)(const QAccessibleEvent &event);
+    typedef void(*UpdateHandler)(QAccessibleEvent *event);
     typedef void(*RootObjectHandler)(QObject*);
 
     static void installFactory(InterfaceFactory);
@@ -338,7 +338,7 @@ public:
     static QAccessibleInterface *queryAccessibleInterface(QObject *);
 
     QT_DEPRECATED static void updateAccessibility(QObject *object, int child, Event reason);
-    static void updateAccessibility(const QAccessibleEvent &event);
+    static void updateAccessibility(QAccessibleEvent *event);
 
     static bool isActive();
     static void setRootObject(QObject *object);