Unity API

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

  1. mirsurface-appid
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Gerry Boland
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
Gerry Boland (community) Approve
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.
lp:~mzanetti/unity-api/mirsurface-appid updated
280. By Michael Zanetti

Add appId property to MirSurfaceInterface

Revision history for this message
Gerry Boland (gerboland) wrote :

ok

review: Approve
Revision history for this message
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
=== modified file 'debian/changelog'
--- debian/changelog 2017-03-15 16:44:37 +0000
+++ debian/changelog 2017-03-15 16:44:37 +0000
@@ -1,3 +1,9 @@
1unity-api (8.6) UNRELEASED; urgency=medium
2
3 * Add appId property to MirSurfaceInterface
4
5 -- Michael Zanetti <michael.zanetti@canonical.com> Wed, 15 Mar 2017 17:38:36 +0100
6
1unity-api (8.5) zesty; urgency=medium7unity-api (8.5) zesty; urgency=medium
28
3 [ Michael Zanetti ]9 [ Michael Zanetti ]
410
=== modified file 'include/unity/shell/application/CMakeLists.txt'
--- include/unity/shell/application/CMakeLists.txt 2017-01-26 11:07:35 +0000
+++ include/unity/shell/application/CMakeLists.txt 2017-03-15 16:44:37 +0000
@@ -7,7 +7,7 @@
77
8set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)8set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
99
10set(VERSION 26)10set(VERSION 27)
11set(PKGCONFIG_NAME "unity-shell-application")11set(PKGCONFIG_NAME "unity-shell-application")
12set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")12set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
13set(PKGCONFIG_REQUIRES "Qt5Core")13set(PKGCONFIG_REQUIRES "Qt5Core")
1414
=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
--- include/unity/shell/application/MirSurfaceInterface.h 2017-01-26 11:07:35 +0000
+++ include/unity/shell/application/MirSurfaceInterface.h 2017-03-15 16:44:37 +0000
@@ -58,6 +58,11 @@
58 Q_PROPERTY(QString persistentId READ persistentId CONSTANT)58 Q_PROPERTY(QString persistentId READ persistentId CONSTANT)
5959
60 /**60 /**
61 * @brief App Id of the app this surface belongs to
62 */
63 Q_PROPERTY(QString appId READ appId CONSTANT)
64
65 /**
61 * @brief Position of the current surface buffer, in pixels.66 * @brief Position of the current surface buffer, in pixels.
62 */67 */
63 Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)68 Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)
@@ -188,6 +193,8 @@
188193
189 virtual QString persistentId() const = 0;194 virtual QString persistentId() const = 0;
190195
196 virtual QString appId() const = 0;
197
191 virtual QPoint position() const = 0;198 virtual QPoint position() const = 0;
192199
193 virtual QSize size() const = 0;200 virtual QSize size() const = 0;

Subscribers

People subscribed via source and target branches

to all changes: