git.iko.soy/unity8
on xenial help sign in
Added implementation for MirSurfaceInterface::persistentId

Approved by: Daniel d'Andrada

commit78baf5822138478b66d448e5f7f362ee0a1b1673 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateWed 31 Aug 2016, 11:55 (10 years ago) parentbf2cf1ff286fa6
4 files changed+11−4
compare with xenial
unifiedsplit
CMakeLists.txt+1−1 debian/control+3−3 tests/mocks/Unity/Application/MirSurface.cpp+5 tests/mocks/Unity/Application/MirSurface.h+2
CMakeLists.txt+1−1
@@ -57,7 +57,7 @@ find_package(Qt5DBus 5.4 REQUIRED)
5757find_package(Qt5Concurrent 5.4 REQUIRED)
5858find_package(Qt5Sql 5.4 REQUIRED)
5959
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=20)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=21)
6161pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
6262pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
6363pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
debian/control+3−3
@@ -35,7 +35,7 @@ Build-Depends: cmake,
3535 libubuntugestures5-dev (>= 1.3.2030),
3636 libubuntugestures5-private-dev (>= 1.3.2030),
3737 libudev-dev,
38− libunity-api-dev (>= 7.117),
38+ libunity-api-dev (>= 7.118),
3939 libusermetricsoutput1-dev,
4040# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
4141 libx11-dev[!arm64 !armhf],
@@ -153,7 +153,7 @@ Depends: qml-module-qtquick-layouts,
153153 qtdeclarative5-ubuntu-settings-components (>= 0.7),
154154 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
155155 ubuntu-thumbnailer-impl-0,
156− unity-application-impl-20,
156+ unity-application-impl-21,
157157 unity-notifications-impl-3,
158158 unity-plugin-scopes | unity-scopes-impl,
159159 unity-scopes-impl-12,
@@ -199,7 +199,7 @@ Pre-Depends: ${misc:Pre-Depends},
199199Depends: ${misc:Depends},
200200 ${shlibs:Depends},
201201Provides: unity-application-impl,
202− unity-application-impl-20,
202+ unity-application-impl-21,
203203Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
204204Description: Fake environment for running Unity 8 shell
205205 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
107107 return m_name;
108108}
109109
110+QString MirSurface::persistentId() const
111+{
112+ return m_name+"Id";
113+}
114+
110115Mir::Type MirSurface::type() const
111116{
112117 return m_type;
tests/mocks/Unity/Application/MirSurface.h+2
@@ -74,6 +74,8 @@ public:
7474
7575 QString name() const override;
7676
77+ QString persistentId() const override;
78+
7779 QSize size() const override { return QSize(width(),height()); }
7880 void resize(int width, int height) override;
7981 void resize(const QSize &size) override { resize(size.width(), size.height()); }