Merge lp:~dandrader/unity8/fallbackCursorNames into lp:unity8
Status: | Merged |
---|---|
Approved by: | Lukáš Tinkl |
Approved revision: | 2039 |
Merged at revision: | 2063 |
Proposed branch: | lp:~dandrader/unity8/fallbackCursorNames |
Merge into: | lp:unity8 |
Diff against target: |
273 lines (+140/-17) 6 files modified
CMakeLists.txt (+1/-1) debian/control (+3/-3) plugins/Cursor/CursorImageProvider.cpp (+113/-13) plugins/Cursor/CursorImageProvider.h (+16/-0) plugins/Cursor/MousePointer.cpp (+5/-0) plugins/Cursor/MousePointer.h (+2/-0) |
To merge this branch: | bzr merge lp:~dandrader/unity8/fallbackCursorNames |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michał Sawicz | Abstain | ||
Lukáš Tinkl (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+277288@code.launchpad.net |
Commit message
Cursor: Add more fallback names, a blank and custom cursor support
Description of the change
For testing (assuming a laptop/desktop in the instructions below), use the following application:
$ bzr branch lp:~dandrader/+junk/animatedDemos
$ cd animatedDemos/
animatedDemos/
animatedDemos/
animatedDemos$ vim football.desktop (edit the Icon path appropriately)
animatedDemos$ unset QT_QPA_
animatedDemos$ export MIR_SOCKET=
animatedDemos$ export QT_QPA_
animatedDemos$ qmlscene -I . CursorShapes.qml --desktop_
* Are there any related MPs required for this MP to build/function as expected? Please list.
https:/
https:/
https:/
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, on a test laptop running a unity8-mir session.
* Did you make sure that your branch does not contain spurious tags?
Yes.
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable
* If you changed the UI, has there been a design review?
Not applicable
FAILED: Continuous integration, rev:2037 jenkins. qa.ubuntu. com/job/ unity8- ci/6699/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 5127/console jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- xenial- touch/114/ console jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- vivid/1411/ console jenkins. qa.ubuntu. com/job/ unity8- qmluitest- xenial- amd64/114/ console jenkins. qa.ubuntu. com/job/ unity8- vivid-amd64- ci/1306/ console jenkins. qa.ubuntu. com/job/ unity8- vivid-i386- ci/1307/ console jenkins. qa.ubuntu. com/job/ unity8- xenial- amd64-ci/ 113/console jenkins. qa.ubuntu. com/job/ unity8- xenial- i386-ci/ 113/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 5139/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- xenial- armhf/114/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/6699/ rebuild
http://