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

[Michael Zanetti]

add appId property to MirSurfaceInterface

[lp:~mzanetti/unity-api/mirsurface-appid]

280. By Michael Zanetti on 2017-03-15

Add appId property to MirSurfaceInterface

[Gerry Boland (gerboland)]

ok

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

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)

=== 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 @@
+unity-api (8.6) UNRELEASED; urgency=medium
+
+  * Add appId property to MirSurfaceInterface
+
+ -- Michael Zanetti <[e-mail]>  Wed, 15 Mar 2017 17:38:36 +0100
+
 unity-api (8.5) zesty; urgency=medium
 
   [ Michael Zanetti ]

=== 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 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 26)
+set(VERSION 27)
 set(PKGCONFIG_NAME "unity-shell-application")
 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== 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 @@
     Q_PROPERTY(QString persistentId READ persistentId CONSTANT)
 
     /**
+     * @brief App Id of the app this surface belongs to
+     */
+    Q_PROPERTY(QString appId READ appId CONSTANT)
+
+    /**
      * @brief Position of the current surface buffer, in pixels.
      */
     Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)
@@ -188,6 +193,8 @@
 
     virtual QString persistentId() const = 0;
 
+    virtual QString appId() const = 0;
+
     virtual QPoint position() const = 0;
 
     virtual QSize size() const = 0;