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/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp
index 47a4ddf56b..b49c183d7b 100644
--- a/src/plugins/generic/evdevmouse/main.cpp
+++ b/src/plugins/generic/evdevmouse/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qgenericplugin_qpa.h>
-#include "qevdevmouse.h"
+#include "qevdevmousemanager.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -71,7 +71,7 @@ QObject* QEvdevMousePlugin::create(const QString &key,
                                    const QString &specification)
 {
     if (!key.compare(QLatin1String("EvdevMouse"), Qt::CaseInsensitive))
-        return new QEvdevMouseHandler(key, specification);
+        return new QEvdevMouseManager(key, specification);
     return 0;
 }