From 135fcd599200cdacf637b5c77824776c3fb181d1 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 30 Sep 2016 13:08:03 +0200
Subject: port to modularized platformsupport libraries

Change-Id: I20eb0e33abfd70b6a5240e7b6b0aa0425f2d2ee7
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
 src/plugins/platforms/mirclient/mirclient.pro                | 5 ++++-
 src/plugins/platforms/mirclient/qmirclientglcontext.cpp      | 2 +-
 src/plugins/platforms/mirclient/qmirclientintegration.cpp    | 4 ++--
 src/plugins/platforms/mirclient/qmirclientplatformservices.h | 4 ++--
 src/plugins/platforms/mirclient/qmirclientscreen.cpp         | 2 +-
 src/plugins/platforms/mirclient/qmirclienttheme.h            | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/plugins/platforms/mirclient')

diff --git a/src/plugins/platforms/mirclient/mirclient.pro b/src/plugins/platforms/mirclient/mirclient.pro
index d5d35f1632..054fe74a46 100644
--- a/src/plugins/platforms/mirclient/mirclient.pro
+++ b/src/plugins/platforms/mirclient/mirclient.pro
@@ -1,6 +1,9 @@
 TARGET = qmirclient
 
-QT += core-private gui-private platformsupport-private dbus
+QT += \
+    core-private gui-private dbus \
+    theme_support-private eventdispatcher_support-private \
+    fontdatabase_support-private egl_support-private
 
 CONFIG += qpa/genericunixfontdatabase
 
diff --git a/src/plugins/platforms/mirclient/qmirclientglcontext.cpp b/src/plugins/platforms/mirclient/qmirclientglcontext.cpp
index 4092669cfc..38eb0a4609 100644
--- a/src/plugins/platforms/mirclient/qmirclientglcontext.cpp
+++ b/src/plugins/platforms/mirclient/qmirclientglcontext.cpp
@@ -41,7 +41,7 @@
 #include "qmirclientglcontext.h"
 #include "qmirclientwindow.h"
 #include "qmirclientlogging.h"
-#include <QtPlatformSupport/private/qeglconvenience_p.h>
+#include <QtEglSupport/private/qeglconvenience_p.h>
 #include <QtGui/private/qopenglcontext_p.h>
 #include <dlfcn.h>
 
diff --git a/src/plugins/platforms/mirclient/qmirclientintegration.cpp b/src/plugins/platforms/mirclient/qmirclientintegration.cpp
index cfbcdc937e..2c8740f070 100644
--- a/src/plugins/platforms/mirclient/qmirclientintegration.cpp
+++ b/src/plugins/platforms/mirclient/qmirclientintegration.cpp
@@ -56,8 +56,8 @@
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatforminputcontextfactory_p.h>
 #include <qpa/qplatforminputcontext.h>
-#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
-#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
+#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
+#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
 #include <QOpenGLContext>
 
 // platform-api
diff --git a/src/plugins/platforms/mirclient/qmirclientplatformservices.h b/src/plugins/platforms/mirclient/qmirclientplatformservices.h
index 46cf4300f8..a1cd5758ca 100644
--- a/src/plugins/platforms/mirclient/qmirclientplatformservices.h
+++ b/src/plugins/platforms/mirclient/qmirclientplatformservices.h
@@ -42,8 +42,8 @@
 #define QMIRCLIENTPLATFORMSERVICES_H
 
 #include <qpa/qplatformservices.h>
-#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
-#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
+#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
+#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
 
 class QMirClientPlatformServices : public QPlatformServices {
 public:
diff --git a/src/plugins/platforms/mirclient/qmirclientscreen.cpp b/src/plugins/platforms/mirclient/qmirclientscreen.cpp
index ca0c3e4733..0a2253e9e2 100644
--- a/src/plugins/platforms/mirclient/qmirclientscreen.cpp
+++ b/src/plugins/platforms/mirclient/qmirclientscreen.cpp
@@ -51,7 +51,7 @@
 #include <QScreen>
 #include <QThread>
 #include <qpa/qwindowsysteminterface.h>
-#include <QtPlatformSupport/private/qeglconvenience_p.h>
+#include <QtEglSupport/private/qeglconvenience_p.h>
 
 #include <memory>
 
diff --git a/src/plugins/platforms/mirclient/qmirclienttheme.h b/src/plugins/platforms/mirclient/qmirclienttheme.h
index 19728741e3..4bab1d0ee0 100644
--- a/src/plugins/platforms/mirclient/qmirclienttheme.h
+++ b/src/plugins/platforms/mirclient/qmirclienttheme.h
@@ -41,7 +41,7 @@
 #ifndef QMIRCLIENTTHEME_H
 #define QMIRCLIENTTHEME_H
 
-#include <QtPlatformSupport/private/qgenericunixthemes_p.h>
+#include <QtThemeSupport/private/qgenericunixthemes_p.h>
 
 class QMirClientTheme : public QGenericUnixTheme
 {
-- 
cgit v1.2.3