Merge lp:~mzanetti/unity-api/mirsurface-appid into lp:unity-api

Proposed by Michael Zanetti on 2017-03-15
Status: Merged
Approved by: Gerry Boland on 2017-03-15
Approved revision: 280
Merged at revision: 277
Proposed branch: lp:~mzanetti/unity-api/mirsurface-appid
Merge into: lp:unity-api
Prerequisite: lp:~mzanetti/unity-api/private-quicklist-entries
Diff against target: 51 lines (+14/-1)
3 files modified
debian/changelog (+6/-0)
include/unity/shell/application/CMakeLists.txt (+1/-1)
include/unity/shell/application/MirSurfaceInterface.h (+7/-0)
To merge this branch: bzr merge lp:~mzanetti/unity-api/mirsurface-appid
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve on 2017-03-15
Gerry Boland 2017-03-15 Approve on 2017-03-15
Review via email: mp+319949@code.launchpad.net

This proposal supersedes a proposal from 2017-03-15.

Commit message

add appId property to MirSurfaceInterface

To post a comment you must log in.
280. By Michael Zanetti on 2017-03-15

Add appId property to MirSurfaceInterface

Gerry Boland (gerboland) wrote :

ok

review: Approve
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:280
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/152/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4478
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4506
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4333/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/152/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-03-15 16:44:37 +0000
3+++ debian/changelog 2017-03-15 16:44:37 +0000
4@@ -1,3 +1,9 @@
5+unity-api (8.6) UNRELEASED; urgency=medium
6+
7+ * Add appId property to MirSurfaceInterface
8+
9+ -- Michael Zanetti <michael.zanetti@canonical.com> Wed, 15 Mar 2017 17:38:36 +0100
10+
11 unity-api (8.5) zesty; urgency=medium
12
13 [ Michael Zanetti ]
14
15=== modified file 'include/unity/shell/application/CMakeLists.txt'
16--- include/unity/shell/application/CMakeLists.txt 2017-01-26 11:07:35 +0000
17+++ include/unity/shell/application/CMakeLists.txt 2017-03-15 16:44:37 +0000
18@@ -7,7 +7,7 @@
19
20 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
21
22-set(VERSION 26)
23+set(VERSION 27)
24 set(PKGCONFIG_NAME "unity-shell-application")
25 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
26 set(PKGCONFIG_REQUIRES "Qt5Core")
27
28=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
29--- include/unity/shell/application/MirSurfaceInterface.h 2017-01-26 11:07:35 +0000
30+++ include/unity/shell/application/MirSurfaceInterface.h 2017-03-15 16:44:37 +0000
31@@ -58,6 +58,11 @@
32 Q_PROPERTY(QString persistentId READ persistentId CONSTANT)
33
34 /**
35+ * @brief App Id of the app this surface belongs to
36+ */
37+ Q_PROPERTY(QString appId READ appId CONSTANT)
38+
39+ /**
40 * @brief Position of the current surface buffer, in pixels.
41 */
42 Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)
43@@ -188,6 +193,8 @@
44
45 virtual QString persistentId() const = 0;
46
47+ virtual QString appId() const = 0;
48+
49 virtual QPoint position() const = 0;
50
51 virtual QSize size() const = 0;

Subscribers

People subscribed via source and target branches

to all changes: