2 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/generic/evdevtablet/main.cpp b/src/plugins/generic/evdevtablet/main.cpp
index 62524e8f33..3a9fd4f1dd 100644
--- a/src/plugins/generic/evdevtablet/main.cpp
+++ b/src/plugins/generic/evdevtablet/main.cpp
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 #include <QtGui/qgenericplugin.h>
-#include <QtPlatformSupport/private/qevdevtablet_p.h>
+#include <QtPlatformSupport/private/qevdevtabletmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -44,7 +44,6 @@ class QEvdevTabletPlugin : public QGenericPlugin
 public:
     QEvdevTabletPlugin();
 
-    QStringList keys() const;
     QObject* create(const QString &key, const QString &specification) Q_DECL_OVERRIDE;
 };
 
@@ -52,16 +51,11 @@ QEvdevTabletPlugin::QEvdevTabletPlugin()
 {
 }
 
-QStringList QEvdevTabletPlugin::keys() const
-{
-    return QStringList() << "EvdevTablet";
-}
-
-QObject *QEvdevTabletPlugin::create(const QString &key,
+QObject* QEvdevTabletPlugin::create(const QString &key,
                                     const QString &spec)
 {
     if (!key.compare(QLatin1String("EvdevTablet"), Qt::CaseInsensitive))
-        return new QEvdevTabletHandlerThread(spec);
+        return new QEvdevTabletManager(key, spec);
 
     return 0;
 }
diff --git a/src/plugins/generic/tuiotouch/qtuiohandler.cpp b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
index 2b42889cb1..2598bc5caf 100644
--- a/src/plugins/generic/tuiotouch/qtuiohandler.cpp
+++ b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
@@ -36,6 +36,7 @@
 #include <QRect>
 #include <QWindow>
 #include <QGuiApplication>
+#include <QTouchDevice>
 
 #include <qpa/qwindowsysteminterface.h>