Merge lp:~mterry/unity8/platform-api into lp:unity8
Status: | Rejected |
---|---|
Rejected by: | Michael Terry |
Proposed branch: | lp:~mterry/unity8/platform-api |
Merge into: | lp:unity8 |
Diff against target: |
41 lines (+6/-7) 2 files modified
debian/control (+1/-0) src/main.cpp (+5/-7) |
To merge this branch: | bzr merge lp:~mterry/unity8/platform-api |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Terry | Abstain | ||
Albert Astals Cid (community) | Needs Fixing | ||
Michał Sawicz | Abstain | ||
Michael Zanetti (community) | Abstain | ||
Gerry Boland (community) | Abstain | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+220978@code.launchpad.net |
Commit message
Rely on platform-api's headers for symbolic constants rather than hard-coding numbers.
Description of the change
Rely on platform-api's headers for symbolic constants rather than hard-coding numbers.
There are three changes here:
A) Set the "session" property of QPlatformNative
B) Use U_SYSTEM_SESSION rather than 1.
C) Use U_INDICATOR_ROLE rather than 2. This one is controversial. The old code suggests that 2 == INDICATOR_
[1] See qtubuntu's src/platforms/
[2] view->setProper
[3] See qtubuntu's src/platforms/
[4] See platform-api's src/ubuntu/
== Checklist ==
* Are there any related MPs required for this MP to build/function as expected? Please list.
- No
* Did you perform an exploratory manual test run of your code change and any related functionality?
- I built it.
* 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?
- I am on that team
* If you changed the UI, has there been a design review?
- NA
Unmerged revisions
- 922. By Michael Terry
-
Merge from trunk
- 921. By Michael Terry
-
Merge from trunk
- 920. By Michael Terry
-
Update header package name
- 919. By Michael Terry
-
Merge from trunk
- 918. By Michael Terry
-
Use libplatform-
api-headers
FAILED: Continuous integration, rev:918 jenkins. qa.ubuntu. com/job/ unity8- ci/3043/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/471 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- utopic/ 81 jenkins. qa.ubuntu. com/job/ unity8- utopic- amd64-ci/ 137 jenkins. qa.ubuntu. com/job/ unity8- utopic- armhf-ci/ 137 jenkins. qa.ubuntu. com/job/ unity8- utopic- armhf-ci/ 137/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity8- utopic- i386-ci/ 137 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/925 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/920 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/920/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 7743
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/3043/ rebuild
http://