Merge lp://qastaging/~thomas-voss/unity-mir/qt-no-keywords into lp://qastaging/unity-mir
Proposed by
Thomas Voß
| Status: | Merged |
|---|---|
| Approved by: | Gerry Boland |
| Approved revision: | 185 |
| Merged at revision: | 194 |
| Proposed branch: | lp://qastaging/~thomas-voss/unity-mir/qt-no-keywords |
| Merge into: | lp://qastaging/unity-mir |
| Diff against target: |
73 lines (+8/-5) 5 files modified
CMakeLists.txt (+3/-0) src/modules/Unity/Application/application_manager.cpp (+2/-2) src/modules/Unity/Application/dbuswindowstack.cpp (+1/-1) src/modules/Unity/Application/dbuswindowstack.h (+1/-1) tests/auto/modules/Unity/Application/main.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~thomas-voss/unity-mir/qt-no-keywords |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Gerry Boland (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Switch to QT_NO_KEYWORDS and with that account for changes in process-cpp.
Description of the change
Are there any related MPs required for this MP to build/function as expected? Please list: Yes, https:/
Did you perform an exploratory manual test run of your code change and any related functionality? Yes, on the N4. No changes in behavior.
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)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good, thanks
• Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
• Did CI run pass? If not, please explain why.
Was fine