Upgrade QtWaylandCompositor API to Qt5.8 and removes some unused/unte…

…sted code
sailfishos · Sep 6, 2018 · d148e39 · d148e39
1 parent 7005c8f
commit d148e39
Show file tree

Hide file tree

Showing 44 changed files with 385 additions and 2,736 deletions.
diff --git a/README b/README
@@ -26,6 +26,7 @@ Tom Swindell - initial work on a pretty UX
 Vesa Halttunen - various functionality additions, guidance, working it towards a product
 Aaron Kennedy - work on Wayland port
 Mikko Harju - work on Wayland issues/port
+Florent Revest - upgraded to QtWaylandCompositor 5.8 APIs
 
 ... and many others. If you feel like you belong here, you probably do. Submit a
 pull request.

diff --git a/plugin/lipstickplugin.cpp b/plugin/lipstickplugin.cpp
@@ -26,12 +26,10 @@
 #include <volume/volumecontrol.h>
 #include <usbmodeselector.h>
 #include <shutdownscreen.h>
-#include <compositor/lipstickkeymap.h>
 #include <compositor/lipstickcompositor.h>
 #include <compositor/lipstickcompositorwindow.h>
 #include <compositor/windowmodel.h>
 #include <compositor/windowpixmapitem.h>
-#include <compositor/windowproperty.h>
 #include <lipstickapi.h>
 #include <hwcimage.h>
 
@@ -64,12 +62,10 @@ void LipstickPlugin::registerTypes(const char *uri)
     qmlRegisterUncreatableType<USBModeSelector>("org.nemomobile.lipstick", 0, 1, "USBModeSelector", "This type is initialized by HomeApplication");
     qmlRegisterUncreatableType<ShutdownScreen>("org.nemomobile.lipstick", 0, 1, "ShutdownScreen", "This type is initialized by HomeApplication");
 
-    qmlRegisterType<LipstickKeymap>("org.nemomobile.lipstick", 0, 1, "Keymap");
     qmlRegisterType<LipstickCompositor>("org.nemomobile.lipstick", 0, 1, "Compositor");
     qmlRegisterUncreatableType<QWaylandSurface>("org.nemomobile.lipstick", 0, 1, "WaylandSurface", "This type is created by the compositor");
     qmlRegisterType<WindowModel>("org.nemomobile.lipstick", 0, 1, "WindowModel");
     qmlRegisterType<WindowPixmapItem>("org.nemomobile.lipstick", 0, 1, "WindowPixmapItem");
-    qmlRegisterType<WindowProperty>("org.nemomobile.lipstick", 0, 1, "WindowProperty");
     qmlRegisterSingletonType<LipstickApi>("org.nemomobile.lipstick", 0, 1, "Lipstick", lipstickApi_callback);
 
     qmlRegisterType<LipstickCompositorWindow>();

diff --git a/plugin/plugin.pro b/plugin/plugin.pro
@@ -3,7 +3,7 @@ TARGET = lipstickplugin
 VERSION = 0.1
 
 CONFIG += qt plugin link_pkgconfig
-QT += core gui qml quick compositor dbus
+QT += core gui qml quick waylandcompositor dbus
 PKGCONFIG += mlite5 dsme_dbus_if thermalmanager_dbus_if usb-moded-qt5
 
 INSTALLS = target qmldirfile

diff --git a/protocol/alien-manager.xml b/protocol/alien-manager.xml
diff --git a/protocol/lipstick-recorder.xml b/protocol/lipstick-recorder.xml