Merge branch 'qtwayland-5.6' into 'master'

[lipstick] Enable building against QtWayland 5.6. JB#44844 See merge request mer-core/lipstick!117
sailfishos · Feb 17, 2021 · 58be4ce · 58be4ce
2 parents 82d9d3a + 6364f29
commit 58be4ce
Show file tree

Hide file tree

Showing 23 changed files with 114 additions and 2,480 deletions.
diff --git a/plugin/lipstickplugin.cpp b/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");

diff --git a/src/compositor/alienmanager/aliensurface.cpp b/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)

diff --git a/src/compositor/compositor.pri b/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
 

diff --git a/src/compositor/eglhybrisbuffer.cpp b/src/compositor/eglhybrisbuffer.cpp
diff --git a/src/compositor/eglhybrisbuffer.h b/src/compositor/eglhybrisbuffer.h
diff --git a/src/compositor/eglhybrisfunctions.cpp b/src/compositor/eglhybrisfunctions.cpp
diff --git a/src/compositor/eglhybrisfunctions.h b/src/compositor/eglhybrisfunctions.h