Merge lp://staging/~unity-api-team/hud/forward-port into lp://staging/hud/14.10

Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 395
Merged at revision: 394
Proposed branch: lp://staging/~unity-api-team/hud/forward-port
Merge into: lp://staging/hud/14.10
Diff against target: 1455 lines (+515/-209)
14 files modified
data/hud.conf.in (+0/-12)
debian/changelog (+34/-0)
libqtgmenu/QtGMenuImporter.cpp (+2/-2)
libqtgmenu/QtGMenuImporter.h (+2/-2)
libqtgmenu/internal/QtGActionGroup.cpp (+31/-31)
libqtgmenu/internal/QtGActionGroup.h (+7/-3)
libqtgmenu/internal/QtGMenuImporterPrivate.cpp (+21/-13)
libqtgmenu/internal/QtGMenuImporterPrivate.h (+4/-3)
libqtgmenu/internal/QtGMenuModel.cpp (+331/-99)
libqtgmenu/internal/QtGMenuModel.h (+20/-17)
service/DBusMenuCollector.cpp (+9/-17)
service/HudServiceImpl.cpp (+45/-5)
service/HudServiceImpl.h (+5/-1)
tests/unit/qtgmenu/TestQtGMenu.cpp (+4/-4)
To merge this branch: bzr merge lp://staging/~unity-api-team/hud/forward-port
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Indicator Applet Developers Pending
Review via email: mp+223025@code.staging.launchpad.net

Commit message

Forward port trusty SRU

Description of the change

Forward port trusty SRU

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

* Are any changes against your component pending/needed to land the MP under review in a functional state and are those called out explicitly by the submitter?

Only affects HUD.

 * Did you do exploratory testing related to the component you own with the MP changeset included?

Ran the whole TestPlan. Note, HUD is disabled on the phone, so only could do simple smoke test. Desktop testing completed fully.

 * Has the submitter requested review by all the relevant teams/reviewres?
Yes.

 * If you are the reviewer owning the component the MP is against, have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

This is a forward port of an already accepted SRU.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches