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/minimalegl/minimalegl.pro             | 4 +++-
 src/plugins/platforms/minimalegl/qminimaleglintegration.cpp | 8 ++++----
 src/plugins/platforms/minimalegl/qminimaleglscreen.cpp      | 4 ++--
 src/plugins/platforms/minimalegl/qminimaleglscreen.h        | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

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

diff --git a/src/plugins/platforms/minimalegl/minimalegl.pro b/src/plugins/platforms/minimalegl/minimalegl.pro
index b8a91729fd..46334a0250 100644
--- a/src/plugins/platforms/minimalegl/minimalegl.pro
+++ b/src/plugins/platforms/minimalegl/minimalegl.pro
@@ -1,6 +1,8 @@
 TARGET = qminimalegl
 
-QT += core-private gui-private platformsupport-private
+QT += \
+    core-private gui-private \
+    eventdispatcher_support-private fontdatabase_support-private egl_support-private
 
 #DEFINES += QEGL_EXTRA_DEBUG
 
diff --git a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
index b1d3691a10..2afe42532e 100644
--- a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
+++ b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
@@ -42,15 +42,15 @@
 #include "qminimaleglwindow.h"
 #include "qminimaleglbackingstore.h"
 
-#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
+#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
 
 #if defined(Q_OS_UNIX)
-#  include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
+#  include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
 #elif defined(Q_OS_WINRT)
 #  include <QtCore/private/qeventdispatcher_winrt_p.h>
 #  include <QtGui/qpa/qwindowsysteminterface.h>
 #elif defined(Q_OS_WIN)
-#  include <QtPlatformSupport/private/qwindowsguieventdispatcher_p.h>
+#  include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
 #endif
 
 #include <qpa/qplatformwindow.h>
@@ -58,7 +58,7 @@
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QScreen>
 
-#include <QtPlatformSupport/private/qt_egl_p.h>
+#include <QtEglSupport/private/qt_egl_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp
index e8a9641224..d3d091fab7 100644
--- a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp
+++ b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp
@@ -40,8 +40,8 @@
 #include "qminimaleglscreen.h"
 #include "qminimaleglwindow.h"
 
-#include <QtPlatformSupport/private/qeglconvenience_p.h>
-#include <QtPlatformSupport/private/qeglplatformcontext_p.h>
+#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <QtEglSupport/private/qeglplatformcontext_p.h>
 
 #ifdef Q_OPENKODE
 #include <KD/kd.h>
diff --git a/src/plugins/platforms/minimalegl/qminimaleglscreen.h b/src/plugins/platforms/minimalegl/qminimaleglscreen.h
index 4b53bbd39a..ba605835a8 100644
--- a/src/plugins/platforms/minimalegl/qminimaleglscreen.h
+++ b/src/plugins/platforms/minimalegl/qminimaleglscreen.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/QTextStream>
 
-#include <QtPlatformSupport/private/qt_egl_p.h>
+#include <QtEglSupport/private/qt_egl_p.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.1