[lipstick] Enable building against QtWayland 5.6. Contributes to JB#5…

…3151

Adapt to the introduced QWaylandOutput and QWaylandClient classes
and the associated API breakage.

And remove the now unused hardware composer integration and API for the
never implemented fullscreen window direct rendering.

plugin/lipstickplugin.cpp

@@ -33,7 +33,6 @@
 #include <compositor/windowpixmapitem.h>
 #include <compositor/windowproperty.h>
 #include <lipstickapi.h>
-#include <hwcimage.h>
 
 static QObject *lipstickApi_callback(QQmlEngine *e, QJSEngine *)
 {
@@ -56,7 +55,6 @@ void LipstickPlugin::registerTypes(const char *uri)
     qmlRegisterType<LauncherItem>("org.nemomobile.lipstick", 0, 1, "LauncherItem");
     qmlRegisterType<LauncherFolderModelType>("org.nemomobile.lipstick", 0, 1, "LauncherFolderModel");
     qmlRegisterType<LauncherFolderItem>("org.nemomobile.lipstick", 0, 1, "LauncherFolderItem");
-    qmlRegisterType<HwcImage>("org.nemomobile.lipstick", 0, 1, "HwcImage");
 
     qmlRegisterUncreatableType<NotificationPreviewPresenter>("org.nemomobile.lipstick", 0, 1, "NotificationPreviewPresenter", "This type is initialized by HomeApplication");
     qmlRegisterUncreatableType<NotificationFeedbackPlayer>("org.nemomobile.lipstick", 0, 1, "NotificationFeedbackPlayer", "This type is initialized by HomeApplication");

src/compositor/alienmanager/aliensurface.cpp

@@ -12,8 +12,14 @@
 **
 ****************************************************************************/
 
+#include <QtCompositorVersion>
+
 #include <QtCompositor/QWaylandSurface>
 
+#if QTCOMPOSITOR_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#include <QtCompositor/QWaylandClient>
+#endif
+
 #include "lipstickcompositor.h"
 #include "aliensurface.h"
 #include "alienmanager.h"
@@ -22,7 +28,11 @@
 AlienSurface::AlienSurface(AlienClient *client, QWaylandSurface *surface, uint32_t version, uint32_t id, const QString &package)
             : QObject(client)
             , QWaylandSurfaceInterface(surface)
+#if QTCOMPOSITOR_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            , QtWaylandServer::alien_surface(surface->client()->client(), id, version)
+#else
             , QtWaylandServer::alien_surface(reinterpret_cast<wl_client *>(surface->client()), id, version)
+#endif
             , m_client(client)
             , m_hidden(false)
             , m_coverized(false)

src/compositor/compositor.pri

@@ -13,12 +13,7 @@ PUBLICHEADERS += \
 
 HEADERS += \
     $$PWD/windowpixmapitem.h \
-    $$PWD/windowproperty.h \
-    $$PWD/lipstickrecorder.h \
-    $$PWD/hwcrenderstage.h \
-    $$PWD/hwcimage.h \
-    $$PWD/eglhybrisbuffer.h \
-    $$PWD/eglhybrisfunctions.h
+    $$PWD/windowproperty.h
 
 SOURCES += \
     $$PWD/lipstickcompositor.cpp \
@@ -30,11 +25,7 @@ SOURCES += \
     $$PWD/windowpixmapitem.cpp \
     $$PWD/windowproperty.cpp \
     $$PWD/lipsticksurfaceinterface.cpp \
-    $$PWD/lipstickrecorder.cpp \
-    $$PWD/hwcrenderstage.cpp \
-    $$PWD/hwcimage.cpp \
-    $$PWD/eglhybrisbuffer.cpp \
-    $$PWD/eglhybrisfunctions.cpp
+    $$PWD/lipstickrecorder.cpp
 
 DEFINES += QT_COMPOSITOR_QUICK