git.iko.soy/unity8
on xenial help sign in
Added implementation for MirSurfaceInterface::persistentId
78baf58Daniel d'Andrada
CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.4 REQUIRED)
57find_package(Qt5Concurrent 5.4 REQUIRED)
57find_package(Qt5Concurrent 5.4 REQUIRED)
58find_package(Qt5Sql 5.4 REQUIRED)
58find_package(Qt5Sql 5.4 REQUIRED)
59
59
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=20)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=21)
61pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
61pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
62pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
62pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
63pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
63pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
debian/control+3−3
@@ -35,7 +35,7 @@ Build-Depends: cmake,
35 libubuntugestures5-dev (>= 1.3.2030),
35 libubuntugestures5-dev (>= 1.3.2030),
36 libubuntugestures5-private-dev (>= 1.3.2030),
36 libubuntugestures5-private-dev (>= 1.3.2030),
37 libudev-dev,
37 libudev-dev,
38− libunity-api-dev (>= 7.117),
38+ libunity-api-dev (>= 7.118),
39 libusermetricsoutput1-dev,
39 libusermetricsoutput1-dev,
40# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
40# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
41 libx11-dev[!arm64 !armhf],
41 libx11-dev[!arm64 !armhf],
@@ -153,7 +153,7 @@ Depends: qml-module-qtquick-layouts,
153 qtdeclarative5-ubuntu-settings-components (>= 0.7),
153 qtdeclarative5-ubuntu-settings-components (>= 0.7),
154 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
154 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
155 ubuntu-thumbnailer-impl-0,
155 ubuntu-thumbnailer-impl-0,
156− unity-application-impl-20,
156+ unity-application-impl-21,
157 unity-notifications-impl-3,
157 unity-notifications-impl-3,
158 unity-plugin-scopes | unity-scopes-impl,
158 unity-plugin-scopes | unity-scopes-impl,
159 unity-scopes-impl-12,
159 unity-scopes-impl-12,
@@ -199,7 +199,7 @@ Pre-Depends: ${misc:Pre-Depends},
199Depends: ${misc:Depends},
199Depends: ${misc:Depends},
200 ${shlibs:Depends},
200 ${shlibs:Depends},
201Provides: unity-application-impl,
201Provides: unity-application-impl,
202− unity-application-impl-20,
202+ unity-application-impl-21,
203Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
203Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
204Description: Fake environment for running Unity 8 shell
204Description: Fake environment for running Unity 8 shell
205 Provides fake implementations of some QML modules used by Unity 8 shell
205 Provides fake implementations of some QML modules used by Unity 8 shell
tests/mocks/Unity/Application/MirSurface.cpp+5
@@ -107,6 +107,11 @@ QString MirSurface::name() const
107 return m_name;
107 return m_name;
108}
108}
109
109
110+QString MirSurface::persistentId() const
111+{
112+ return m_name+"Id";
113+}
114+
110Mir::Type MirSurface::type() const
115Mir::Type MirSurface::type() const
111{
116{
112 return m_type;
117 return m_type;
tests/mocks/Unity/Application/MirSurface.h+2
@@ -74,6 +74,8 @@ public:
74
74
75 QString name() const override;
75 QString name() const override;
76
76
77+ QString persistentId() const override;
78+
77 QSize size() const override { return QSize(width(),height()); }
79 QSize size() const override { return QSize(width(),height()); }
78 void resize(int width, int height) override;
80 void resize(int width, int height) override;
79 void resize(const QSize &size) override { resize(size.width(), size.height()); }
81 void resize(const QSize &size) override { resize(size.width(), size.height()); }