Unity API

Merge lp:~nick-dedekind/unity-api/persistent_surface_id into lp:unity-api

  1. persistent_surface_id
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Superseded
Proposed branch: lp:~nick-dedekind/unity-api/persistent_surface_id
Merge into: lp:unity-api
Diff against target: 52 lines (+15/-1)
3 files modified
debian/changelog (+7/-0)
include/unity/shell/application/CMakeLists.txt (+1/-1)
include/unity/shell/application/MirSurfaceInterface.h (+7/-0)
To merge this branch: bzr merge lp:~nick-dedekind/unity-api/persistent_surface_id
Reviewer Review Type Date Requested Status
Michał Sawicz Needs Fixing
Daniel d'Andrada (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+296992@code.launchpad.net

This proposal has been superseded by a proposal from 2016-08-22.

Commit message

Added MirSurfaceInterface::persistentId property

Description of the change

Added MirSurfaceInterface::persistentId property

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:236
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/88/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1941
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1967
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1901
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1901
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1901
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1892/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1892
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1892/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

LGTM

review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

Text conflict in debian/changelog
1 conflicts encountered.

review: Needs Fixing

Unmerged revisions

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 2016-05-25 06:02:38 +0000
3+++ debian/changelog 2016-06-09 19:33:19 +0000
4@@ -1,3 +1,10 @@
5+unity-api (7.114) UNRELEASED; urgency=medium
6+
7+ [Nick Dedekind ]
8+ * Added persistent Id property for MirSurface
9+
10+ -- Nick Dedekind <nick.dedekind@canonical.com> Thu, 09 Jun 2016 14:40:35 +0100
11+
12 unity-api (7.113+16.10.20160525-0ubuntu1) yakkety; urgency=medium
13
14 [ Daniel d'Andrada ]
15
16=== modified file 'include/unity/shell/application/CMakeLists.txt'
17--- include/unity/shell/application/CMakeLists.txt 2016-05-18 20:51:23 +0000
18+++ include/unity/shell/application/CMakeLists.txt 2016-06-09 19:33:19 +0000
19@@ -7,7 +7,7 @@
20
21 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
22
23-set(VERSION 17)
24+set(VERSION 18)
25 set(PKGCONFIG_NAME "unity-shell-application")
26 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
27 set(PKGCONFIG_REQUIRES "Qt5Core")
28
29=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
30--- include/unity/shell/application/MirSurfaceInterface.h 2016-05-17 12:55:00 +0000
31+++ include/unity/shell/application/MirSurfaceInterface.h 2016-06-09 19:33:19 +0000
32@@ -52,6 +52,11 @@
33 Q_PROPERTY(QString name READ name NOTIFY nameChanged)
34
35 /**
36+ * @brief Persistent Id of the surface
37+ */
38+ Q_PROPERTY(QString persistentId READ persistentId CONSTANT)
39+
40+ /**
41 * @brief Size of the current surface buffer, in pixels.
42 */
43 Q_PROPERTY(QSize size READ size NOTIFY sizeChanged)
44@@ -143,6 +148,8 @@
45
46 virtual QString name() const = 0;
47
48+ virtual QString persistentId() const = 0;
49+
50 virtual QSize size() const = 0;
51 virtual void resize(int width, int height) = 0;
52 virtual void resize(const QSize &size) = 0;

Subscribers

People subscribed via source and target branches

to all changes: