port to modularized platformsupport libraries

Change-Id: I20eb0e33abfd70b6a5240e7b6b0aa0425f2d2ee7
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

12 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
index d23ad3bad0..73fddf4d26 100644
--- a/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
+++ b/src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
@@ -1,6 +1,6 @@
 TARGET = qevdevkeyboardplugin
 
-QT += core-private platformsupport-private gui-private
+QT += core-private gui-private input_support-private
 
 SOURCES = main.cpp
 
diff --git a/src/plugins/generic/evdevkeyboard/main.cpp b/src/plugins/generic/evdevkeyboard/main.cpp
index 7fd6feaecc..ef08cd56ab 100644
--- a/src/plugins/generic/evdevkeyboard/main.cpp
+++ b/src/plugins/generic/evdevkeyboard/main.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include <QtGui/qgenericplugin.h>
-#include <QtPlatformSupport/private/qevdevkeyboardmanager_p.h>
+#include <QtInputSupport/private/qevdevkeyboardmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/generic/evdevmouse/evdevmouse.pro b/src/plugins/generic/evdevmouse/evdevmouse.pro
index 1a0bc08853..f3a8558ef2 100644
--- a/src/plugins/generic/evdevmouse/evdevmouse.pro
+++ b/src/plugins/generic/evdevmouse/evdevmouse.pro
@@ -1,6 +1,6 @@
 TARGET = qevdevmouseplugin
 
-QT += core-private platformsupport-private gui-private
+QT += core-private gui-private input_support-private
 
 SOURCES = main.cpp
 
diff --git a/src/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp
index 88c29366fa..86ec7cb575 100644
--- a/src/plugins/generic/evdevmouse/main.cpp
+++ b/src/plugins/generic/evdevmouse/main.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include <QtGui/qgenericplugin.h>
-#include <QtPlatformSupport/private/qevdevmousemanager_p.h>
+#include <QtInputSupport/private/qevdevmousemanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/generic/evdevtablet/evdevtablet.pro b/src/plugins/generic/evdevtablet/evdevtablet.pro
index aaf0ef4c67..1409cd83c9 100644
--- a/src/plugins/generic/evdevtablet/evdevtablet.pro
+++ b/src/plugins/generic/evdevtablet/evdevtablet.pro
@@ -2,7 +2,7 @@ TARGET = qevdevtabletplugin
 
 SOURCES = main.cpp
 
-QT += core-private platformsupport-private gui-private
+QT += core-private gui-private input_support-private
 
 OTHER_FILES += \
     evdevtablet.json
diff --git a/src/plugins/generic/evdevtablet/main.cpp b/src/plugins/generic/evdevtablet/main.cpp
index cf8dc15c6e..0646d71146 100644
--- a/src/plugins/generic/evdevtablet/main.cpp
+++ b/src/plugins/generic/evdevtablet/main.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include <QtGui/qgenericplugin.h>
-#include <QtPlatformSupport/private/qevdevtabletmanager_p.h>
+#include <QtInputSupport/private/qevdevtabletmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/generic/evdevtouch/evdevtouch.pro b/src/plugins/generic/evdevtouch/evdevtouch.pro
index 4d61db4eb0..3ca646aaca 100644
--- a/src/plugins/generic/evdevtouch/evdevtouch.pro
+++ b/src/plugins/generic/evdevtouch/evdevtouch.pro
@@ -2,7 +2,7 @@ TARGET = qevdevtouchplugin
 
 SOURCES = main.cpp
 
-QT += core-private platformsupport-private gui-private
+QT += core-private gui-private input_support-private
 
 OTHER_FILES += \
     evdevtouch.json
diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp
index 411bf3d7a0..aa60614936 100644
--- a/src/plugins/generic/evdevtouch/main.cpp
+++ b/src/plugins/generic/evdevtouch/main.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include <QtGui/qgenericplugin.h>
-#include <QtPlatformSupport/private/qevdevtouchmanager_p.h>
+#include <QtInputSupport/private/qevdevtouchmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/generic/libinput/libinput.pro b/src/plugins/generic/libinput/libinput.pro
index 335605d354..434bf7b945 100644
--- a/src/plugins/generic/libinput/libinput.pro
+++ b/src/plugins/generic/libinput/libinput.pro
@@ -1,6 +1,6 @@
 TARGET = qlibinputplugin
 
-QT += core-private platformsupport-private gui-private
+QT += core-private gui-private input_support-private
 
 SOURCES = main.cpp
 
diff --git a/src/plugins/generic/libinput/main.cpp b/src/plugins/generic/libinput/main.cpp
index e40fdd0097..6d1e76c0f0 100644
--- a/src/plugins/generic/libinput/main.cpp
+++ b/src/plugins/generic/libinput/main.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include <QtGui/qgenericplugin.h>
-#include <QtPlatformSupport/private/qlibinputhandler_p.h>
+#include <QtInputSupport/private/qlibinputhandler_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/generic/tslib/main.cpp b/src/plugins/generic/tslib/main.cpp
index c5e0c720fc..fb9e0c35f3 100644
--- a/src/plugins/generic/tslib/main.cpp
+++ b/src/plugins/generic/tslib/main.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include <QtGui/qgenericplugin.h>
-#include <QtPlatformSupport/private/qtslib_p.h>
+#include <QtInputSupport/private/qtslib_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro
index d6a0eea3a0..7c3a0bf607 100644
--- a/src/plugins/generic/tslib/tslib.pro
+++ b/src/plugins/generic/tslib/tslib.pro
@@ -2,7 +2,7 @@ TARGET = qtslibplugin
 
 SOURCES = main.cpp
 
-QT += gui-private platformsupport-private
+QT += core-private gui-private input_support-private
 
 QMAKE_USE += tslib