Merge lp:~hikiko/nux/nux.virtual-StaticText-func into lp:nux
Proposed by
Eleni Maria Stea
Status: | Work in progress |
---|---|
Proposed branch: | lp:~hikiko/nux/nux.virtual-StaticText-func |
Merge into: | lp:nux |
Diff against target: |
25 lines (+2/-2) 2 files modified
Nux/AbstractButton.h (+1/-1) Nux/Button.h (+1/-1) |
To merge this branch: | bzr merge lp:~hikiko/nux/nux.virtual-StaticText-func |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Unity Team | Pending | ||
Review via email: mp+218246@code.launchpad.net |
Commit message
minor change to nux: some functions that use StaticText are converted to virtual in order to override them in unity and replace the StaticText with the scalable StaticCairoText.
Description of the change
minor change to nux: some functions that use StaticText are converted to virtual in order to override them in unity and replace the StaticText with the scalable StaticCairoText.
To post a comment you must log in.
Unmerged revisions
- 846. By Eleni Maria Stea
-
functions that use StaticText should be virtual because we ll override them
in unity (to replace StaticText with StaticCairoText)
PASSED: Continuous integration, rev:846 jenkins. qa.ubuntu. com/job/ nux-ci/ 107/ jenkins. qa.ubuntu. com/job/ nux-trusty- amd64-ci/ 29 jenkins. qa.ubuntu. com/job/ nux-trusty- armhf-ci/ 29 jenkins. qa.ubuntu. com/job/ nux-trusty- i386-ci/ 29
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/nux- ci/107/ rebuild
http://