Move eglfs-only parts back from eglconvenience

The integration, screen, window and cursor classes were split in Qt 5.3 under a plan
of sharing these between eglfs, the Android port and potentially other future plugins.
This never materialized.

Maintaining the artificial split is getting difficult and is prone to errors. Therefore
it is time to merge back these base classes into eglfs. The result is cleaner, smaller,
and potentially better performing code. eglconvenience is now restored to be a collection
of convenience classes instead of platform plugin bits.

Change-Id: I75c6ad876ef66a1a0c5b39c1c307f928d2ed47d4
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>

1 files changed, 6 insertions, 19 deletions

diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
index d102203d5e..457efd68fb 100644
--- a/src/platformsupport/eglconvenience/eglconvenience.pri
+++ b/src/platformsupport/eglconvenience/eglconvenience.pri
@@ -1,29 +1,16 @@
 contains(QT_CONFIG,egl) {
     HEADERS += \
-        $$PWD/qeglconvenience_p.h \
-        $$PWD/qeglpbuffer_p.h
+        $$PWD/qeglconvenience_p.h
 
     SOURCES += \
-        $$PWD/qeglconvenience.cpp \
-        $$PWD/qeglpbuffer.cpp
+        $$PWD/qeglconvenience.cpp
 
     contains(QT_CONFIG,opengl) {
-        HEADERS += $$PWD/qeglplatformcontext_p.h
-        SOURCES += $$PWD/qeglplatformcontext.cpp
+        HEADERS += $$PWD/qeglplatformcontext_p.h \
+                   $$PWD/qeglpbuffer_p.h
 
-        unix {
-            HEADERS += \
-                $$PWD/qeglplatformcursor_p.h \
-                $$PWD/qeglplatformwindow_p.h \
-                $$PWD/qeglplatformscreen_p.h \
-                $$PWD/qeglplatformintegration_p.h
-
-            SOURCES += \
-                $$PWD/qeglplatformcursor.cpp \
-                $$PWD/qeglplatformwindow.cpp \
-                $$PWD/qeglplatformscreen.cpp \
-                $$PWD/qeglplatformintegration.cpp
-        }
+        SOURCES += $$PWD/qeglplatformcontext.cpp \
+                   $$PWD/qeglpbuffer.cpp
     }
 
     # Avoid X11 header collision