Merge lp:~michael-sheldon/content-hub/qdoc-import-fix into lp:content-hub
Proposed by
Michael Sheldon
Status: | Merged |
---|---|
Merged at revision: | 91 |
Proposed branch: | lp:~michael-sheldon/content-hub/qdoc-import-fix |
Merge into: | lp:content-hub |
Prerequisite: | lp:~michael-sheldon/content-hub/qdoc-fix |
Diff against target: |
162 lines (+15/-12) 13 files modified
doc/qml/pages/mainpage.qdoc (+1/-1) doc/qml/pages/moduledef.qdoc (+3/-0) import/Ubuntu/Content/ContentPeerPicker.qml (+1/-1) import/Ubuntu/Content/ContentTransferHint.qml (+1/-1) import/Ubuntu/Content/contenthandler.cpp (+1/-1) import/Ubuntu/Content/contenthub.cpp (+1/-1) import/Ubuntu/Content/contentitem.cpp (+1/-1) import/Ubuntu/Content/contentpeer.cpp (+1/-1) import/Ubuntu/Content/contentpeermodel.cpp (+1/-1) import/Ubuntu/Content/contentscope.cpp (+1/-1) import/Ubuntu/Content/contentstore.cpp (+1/-1) import/Ubuntu/Content/contenttransfer.cpp (+1/-1) import/Ubuntu/Content/contenttype.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~michael-sheldon/content-hub/qdoc-import-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ken VanDine | Pending | ||
Review via email: mp+213838@code.launchpad.net |
Commit message
Fixes version number of import statements in QML documentation.
Description of the change
Fixes version number of import statements in QML documentation.
To post a comment you must log in.
Are there any related MPs required for this MP to build/function as expected? Please list.
* No
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
* Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
* Yes
Did you successfully run all tests found in your component's Test Plan (https:/ /wiki.ubuntu. com/Process/ Merges/ TestPlan/ content- hub) on device or emulator?
* Yes
If you changed the UI, was the change specified/approved by design?
* No change
If you changed the packaging (debian), did you subscribe a core-dev to this MP?
* No change