Merge lp:~abreu-alexandre/unity-scopes-api/remove-emblem-doc-preview-widget into lp:unity-scopes-api

Proposed by Alexandre Abreu
Status: Rejected
Rejected by: Michi Henning
Proposed branch: lp:~abreu-alexandre/unity-scopes-api/remove-emblem-doc-preview-widget
Merge into: lp:unity-scopes-api
Diff against target: 11 lines (+0/-1)
1 file modified
src/scopes/PreviewWidget.cpp (+0/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/unity-scopes-api/remove-emblem-doc-preview-widget
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+285788@code.launchpad.net

Commit message

Remove 'emblem' attribute documentation for PreviewWidget since it is not supported by Unity8 at the moment

Description of the change

Remove 'emblem' attribute documentation for PreviewWidget since it is not supported by Unity8 at the moment

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
Michi Henning (michihenning) wrote :

There is fix in the shell for this now: https://code.launchpad.net/~aacid/unity8/emblemInPreviews/+merge/286038

I'm rejecting this because the doc is correct as it was. Reality caught up with the doc :-)

Unmerged revisions

358. By Alexandre Abreu

Remove 'emblem' attribute documentation for PreviewWidget since it is not supported by Unity8 at the moment

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/scopes/PreviewWidget.cpp'
2--- src/scopes/PreviewWidget.cpp 2015-12-10 16:26:30 +0000
3+++ src/scopes/PreviewWidget.cpp 2016-02-11 17:58:34 +0000
4@@ -204,7 +204,6 @@
5 \arg \c subtitle A string specifying the subtitle
6 \arg \c mascot A URI specifying the mascot
7 \arg \c fallback A fallback image to be used if the mascot URI cannot be retrieved (default: none)
8-\arg \c emblem A URI specifying the emblem
9
10 \code{.cpp}
11 {

Subscribers

People subscribed via source and target branches

to all changes: