Merge lp://staging/~gerboland/qtmir/desktopFileReader into lp://staging/qtmir/rtm-14.09
Proposed by
Michał Sawicz
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Gerry Boland | ||||
| Approved revision: | 268 | ||||
| Merged at revision: | 270 | ||||
| Proposed branch: | lp://staging/~gerboland/qtmir/desktopFileReader | ||||
| Merge into: | lp://staging/qtmir/rtm-14.09 | ||||
| Diff against target: |
946 lines (+678/-158) 8 files modified
src/modules/Unity/Application/Application.pro (+3/-2) src/modules/Unity/Application/desktopfilereader.cpp (+169/-115) src/modules/Unity/Application/desktopfilereader.h (+22/-40) src/modules/Unity/Application/gscopedpointer.h (+113/-0) tests/modules/DesktopFileReader/DesktopFileReader.pro (+15/-0) tests/modules/DesktopFileReader/calculator.desktop (+227/-0) tests/modules/DesktopFileReader/desktopfilereader_test.cpp (+128/-0) tests/modules/modules.pro (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~gerboland/qtmir/desktopFileReader | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gerry Boland (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Rewrite DesktopFileReader to use GDesktopAppInfo, enables reading localized keys
Description of the change
Rewrite DesktopFileReader to use GDesktopAppInfo, enables reading localized keys
* Are there any related MPs required for this MP to build/function as expected? Please list.
N
* Did you perform an exploratory manual test run of your code change and any related functionality?
Y
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM