Merge lp:~dandrader/unity-api/surfaceCursor into lp:unity-api

[Daniel d'Andrada]

Added MirMousePointerInterface::setCustomCursor

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:195
http://jenkins.qa.ubuntu.com/job/unity-api-ci/358/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/57

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/358/rebuild

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

LGTM, approving

review: Approve

[lp:~dandrader/unity-api/surfaceCursor]

196. By Daniel d'Andrada on 2015-11-27

Merge trunk

Unmerged revisions

196. By Daniel d'Andrada on 2015-11-27

Merge trunk

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-02 11:23:43 +0000
+++ debian/changelog	2015-11-11 19:00:11 +0000
@@ -1,7 +1,13 @@
+unity-api (7.103) UNRELEASED; urgency=medium
+
+  * Added MirMousePointerInterface::setCustomCursor
+
+ -- Daniel d'Andrada <[e-mail]>  Wed, 11 Nov 2015 16:42:27 -0200
+
 unity-api (7.102+16.04.20151102-0ubuntu1) xenial; urgency=medium
 
   [ Nick Dedekind ]
-  * Added visibility to surface interface. 
+  * Added visibility to surface interface.
 
   [ Michael Terry ]
   * Add isTouchApp to ApplicationInfoInterface

=== modified file 'include/unity/shell/application/CMakeLists.txt'
--- include/unity/shell/application/CMakeLists.txt	2015-10-30 16:56:14 +0000
+++ include/unity/shell/application/CMakeLists.txt	2015-11-11 19:00:11 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 10)
+set(VERSION 11)
 set(PKGCONFIG_NAME "unity-shell-application")
 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'include/unity/shell/application/MirMousePointerInterface.h'
--- include/unity/shell/application/MirMousePointerInterface.h	2015-10-13 20:17:39 +0000
+++ include/unity/shell/application/MirMousePointerInterface.h	2015-11-11 19:00:11 +0000
@@ -70,6 +70,15 @@
     virtual qreal hotspotY() const = 0;
     /// @endcond
 
+    /**
+     * @brief Sets the custom cursor
+     *
+     * If it's not a pixmap cursor it will be ignored.
+     *
+     * To use it, cursorName must be set to "custom". themeName is ignored in this case.
+     */
+    virtual void setCustomCursor(const QCursor &) = 0;
+
 Q_SIGNALS:
     /// @cond
     void cursorNameChanged(QString name);