Merge lp://staging/~unity-team/qtmir/build_with_clang into lp://staging/qtmir
Proposed by
Michał Sawicz
| Status: | Merged |
|---|---|
| Approved by: | Gerry Boland |
| Approved revision: | 390 |
| Merged at revision: | 413 |
| Proposed branch: | lp://staging/~unity-team/qtmir/build_with_clang |
| Merge into: | lp://staging/qtmir |
| Prerequisite: | lp://staging/~unity-team/qtmir/liveCaption |
| Diff against target: |
134 lines (+12/-12) 8 files modified
src/modules/Unity/Application/desktopfilereader.cpp (+2/-1) src/modules/Unity/Application/mirsurfaceitem.h (+1/-1) src/modules/Unity/Application/objectlistmodel.h (+1/-1) src/platforms/mirserver/qmirserver.cpp (+1/-1) src/platforms/mirserver/qmirserver_p.h (+2/-1) tests/modules/common/fake_mirsurface.h (+1/-3) tests/modules/common/qtmir_test.h (+1/-1) tests/modules/common/stub_scene_surface.h (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~unity-team/qtmir/build_with_clang |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gerry Boland (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Alan Griffiths | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-09-30.
Commit message
Build with clang (tests/gmock fails and is unfixable on our side i'd say)
Description of the change
* Are there any related MPs required for this MP to build/function as expected?
No, but https:/
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* 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.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Albert Astals Cid (aacid) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Gerry Boland (gerboland) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
- argv[argc] = '\0';
+ argv[argc] = "\0";
This changes the meaning to be incorrect. It should be:
argv[argc] = nullptr;